|
@@ -69,7 +69,7 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
|
|
|
if(!ObjectUtils.isEmpty(listed)) {
|
|
|
//队长审核不通过
|
|
|
GTeamProcess gTeamProcess = listed.get(0);
|
|
|
- String regex = "^(xx|XX).{2}";
|
|
|
+ String regex = "^xx.*";
|
|
|
if (gTeamProcess.getUserPost().matches(regex)) {
|
|
|
if (gTeamProcess.getProcessStatus().equals("1")){
|
|
|
obj.setProcessStatus("2");
|
|
@@ -121,13 +121,13 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
|
|
|
//未审核过队长先展示
|
|
|
List<GTeamProcess> listed = teamProcessService.list(new QueryWrapper<GTeamProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
|
|
|
if (ObjectUtils.isEmpty(listed)){
|
|
|
- String regex = "^(xx|XX).{2}";
|
|
|
+ String regex = "^xx.*";
|
|
|
if (bo.getPostNameArias().matches(regex)){
|
|
|
item.setFlag(true);
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
- String regex = "^(xx|XX).{2}";
|
|
|
+ String regex = "^xx.*";
|
|
|
if (bo.getPostNameArias().matches(regex)){
|
|
|
if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
|
|
|
if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
|