fix: 容量根据工作队匹配工程师数据错误

project-order/src/main/java/com/dituhui/pea/order/dao/EngineerInfoDao.java

@@ -84,14 +84,14 @@ public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integ
      * @param teamId           工作队ID
      * @param teamId           工作队ID
      * @return 工程师信息
      * @return 工程师信息
      */
      */
-    @Query(value = "SELECT ei.* FROM org_team_engineer ote  " +
-            " LEFT JOIN  " +
+    @Query(value = "SELECT ei.* FROM " +
             " (SELECT esg.engineer_code AS engineer_code FROM engineer_skill_group esg   " +
             " (SELECT esg.engineer_code AS engineer_code FROM engineer_skill_group esg   " +
             "               WHERE esg.status = 1 AND  esg.skill_group_code  IN( :skillGroupCodes) group by esg.engineer_code having count(esg.skill_group_code) = :skillGroupNumber  " +
             "               WHERE esg.status = 1 AND  esg.skill_group_code  IN( :skillGroupCodes) group by esg.engineer_code having count(esg.skill_group_code) = :skillGroupNumber  " +
-            "  ) AS  tabA ON tabA.engineer_code = ote.engineer_code  " +
+            "              ) AS  tabA" +
+            "            LEFT JOIN   org_team_engineer ote   ON tabA.engineer_code = ote.engineer_code " +
             "            LEFT JOIN engineer_info ei  ON ei.engineer_code = tabA.engineer_code  " +
             "            LEFT JOIN engineer_info ei  ON ei.engineer_code = tabA.engineer_code  " +
-            " WHERE ote.team_id  = :teamId AND ote.status = 1 AND ei.id is not null" +
-            " order by ei.engineer_code  desc", nativeQuery = true)
+            "WHERE ote.team_id  = :teamId AND ote.status = 1" +
+            "             order by ei.engineer_code  desc ", nativeQuery = true)
     Set<EngineerInfoEntity> listBySkillGroupCode(@Param("skillGroupCodes") Collection<String> skillGroupCodes, @Param("skillGroupNumber") int skillGroupNumber, @Param("teamId") String teamId);
     Set<EngineerInfoEntity> listBySkillGroupCode(@Param("skillGroupCodes") Collection<String> skillGroupCodes, @Param("skillGroupNumber") int skillGroupNumber, @Param("teamId") String teamId);
 
 
     /**
     /**