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

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

@@ -129,6 +129,6 @@ public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integ
             "WHERE ote.team_id = :teamId AND ote.engineer_code = :engineerCode AND ote.`status` = 1", nativeQuery = true)
     EngineerInfoEntity selectEngineerByEngineerCodeAndTeamId(@Param("engineerCode") String engineerCode, @Param("teamId") String teamId);
 
-    @Query(value = "SELECT DISTINCT esg.engineer_code  FROM engineer_skill_group esg WHERE engineer_code in (:engineerCodes) and skill_group_code in (:skillGroupCodes)", nativeQuery = true)
+    @Query(value = "SELECT DISTINCT esg.engineer_code  FROM engineer_skill_group esg WHERE engineer_code in (:engineerCodes) and skill_group_code in (:skillGroupCodes) and status = 1", nativeQuery = true)
     List<String> findByEngineerCodesBySkillCodes(@Param("engineerCodes") List<String> engineerCodes, @Param("skillGroupCodes") Set<String> skillGroupCodes);
 }