fix: 技能组关联关系为逻辑删除

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

@@ -71,7 +71,7 @@ public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integ
             "            LEFT JOIN engineer_info ei ON esg.engineer_code = ei.engineer_code\n" +
             "            LEFT JOIN org_team_engineer ote ON ote.engineer_code = ei.engineer_code \n" +
             "            WHERE si.brand = :brand AND si.type= :productType AND si.skill = :skill \n" +
-            "            AND ote.team_id = :teamId  AND ote.status = 1", nativeQuery = true)
+            "            AND ote.team_id = :teamId  AND ote.status = 1 AND esg.status = 1", nativeQuery = true)
     Set<EngineerInfoEntity> listByBrandAndTypeAndSkillAndTeamId(@Param("brand") String brand, @Param("productType") String productType,
                                                                 @Param("skill") String skill, @Param("teamId") String teamId);
 

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

@@ -30,6 +30,6 @@ public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupE
      * @return 工程师技能组信息
      */
     @Query(value = "SELECT esg.* FROM  engineer_skill_group esg LEFT JOIN  skill_group sg  ON sg.skill_group_code  = esg.skill_group_code \n" +
-            " WHERE esg.engineer_code = :engineerCode", nativeQuery = true)
+            " WHERE esg.engineer_code = :engineerCode AND esg.status = 1", nativeQuery = true)
     List<EngineerSkillGroupEntity> getEngineerSkillGroup(String engineerCode);
 }