Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerGanttServiceImpl.java

@@ -46,9 +46,10 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
         // 按日期返回技术员们当天的服务甘特图，不需要翻页
         // 按日期返回技术员们当天的服务甘特图，不需要翻页
         log.info("getEngineersGanttList: {}", reqDTO);
         log.info("getEngineersGanttList: {}", reqDTO);
         List<String> engineerCodes = reqDTO.getEngineerCodes();
         List<String> engineerCodes = reqDTO.getEngineerCodes();
-        if (engineerCodes == null || engineerCodes.size() > 0) {
+        if (engineerCodes == null || engineerCodes.size() == 0) {
             // 需要根据levelType/levelValue/brandIds/branchIds/groupIds/teamIds/key，后端查询匹配
             // 需要根据levelType/levelValue/brandIds/branchIds/groupIds/teamIds/key，后端查询匹配
             engineerCodes = findEngineers(reqDTO.getLevelType(), reqDTO.getLevelValue(), reqDTO.getBranchIds(), reqDTO.getGroupIds(), reqDTO.getTeamIds(), reqDTO.getKey());
             engineerCodes = findEngineers(reqDTO.getLevelType(), reqDTO.getLevelValue(), reqDTO.getBranchIds(), reqDTO.getGroupIds(), reqDTO.getTeamIds(), reqDTO.getKey());
+            log.info("根据多条件，查询返回符合条件的技术员列表：{}", engineerCodes);
         }
         }
 
 
         List<OrderAppointmentEntity> orderAppointments = orderAppointmentDao.findByDateAndEngineerCodeIn(reqDTO.getDate(), engineerCodes);
         List<OrderAppointmentEntity> orderAppointments = orderAppointmentDao.findByDateAndEngineerCodeIn(reqDTO.getDate(), engineerCodes);
@@ -122,9 +123,13 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
         } else {
         } else {
             engineerCodes.addAll(engineerUtil.getEngineersByLevel(levelType, levelValue).stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toList()));
             engineerCodes.addAll(engineerUtil.getEngineersByLevel(levelType, levelValue).stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toList()));
         }
         }
-        // 最后，还需要根据key进行过滤（需要结合数据库表）
         engineerCodes = new ArrayList<>(new HashSet<>(engineerCodes));
         engineerCodes = new ArrayList<>(new HashSet<>(engineerCodes));
-        return engineerUtil.filterEngineersByKey(engineerCodes, key).stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toList());
+        if (StringUtils.isBlank(key)) {
+            return engineerCodes;
+        } else {
+            // 最后，还需要根据key进行过滤（需要结合数据库表）
+            return engineerUtil.filterEngineersByKey(engineerCodes, key).stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toList());
+        }
     }
     }
 
 
     public Map<String, OrderRequestEntity> getOrdersByOrderIds(List<String> orderIds) {
     public Map<String, OrderRequestEntity> getOrdersByOrderIds(List<String> orderIds) {