diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java index ada4f7bf42..5a9f6d63e5 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java @@ -55,7 +55,7 @@ public class PatrolRoutineWorkFormDTO implements Serializable { @Range(min = 0, max = 1, message = "重点人员是否在当地格式错误", groups = AddOrUpdateForm.class) private Integer isKeyPeopleLocate; /** - * 重点人员现状 + * 当事件类型为【特殊人群服务与管理】时必填 重点人员现状 */ private String keyPeopleStatus; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index fba74fcbce..61bb3d0e39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -116,7 +116,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl 0) { + } else if (pidSb.indexOf(pid) == NumConstant.ONE_NEG) { + if (pidSb.length() > NumConstant.ZERO) { pidSb.append(StrConstant.COLON); } pidSb.append(pid);