Merge remote-tracking branch 'origin/dev'

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

@@ -74,7 +74,10 @@ import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -112,7 +115,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
     public void add(PatrolRoutineWorkFormDTO formDTO) {
         PatrolRoutineWorkEntity entity = null;
         try {
-            if (formDTO.getWorkTypeList().toString().contains("02")
+            if (formDTO.getWorkTypeList().toString().startsWith("02")
                     && (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());