Merge remote-tracking branch 'remotes/origin/develop' into release_temp

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java

@@ -78,7 +78,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
     @Override
     public void add(PatrolRoutineWorkFormDTO formDTO) {
         if (formDTO.getWorkTypeList().toString().contains("02")
-                && (StringUtils.isBlank(formDTO.getIsKeyPeopleLocate()) || StringUtils.isBlank(formDTO.getKeyPeopleStatus()))){
+                && (formDTO.getIsKeyPeopleLocate() == null || StringUtils.isBlank(formDTO.getKeyPeopleStatus()))){
             log.warn("add patrolRoutineWork fail,param is error,param:{}", JSON.toJSONString(formDTO));
             throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode());
         }