[bug-7860] 人员能力评估根据配置判断是否带出公用评估项

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/sqlzdy/Service/SwdlServiceImpl.java

@@ -374,6 +374,13 @@ public class SwdlServiceImpl extends GenericProvider implements SwdlService {
                         if(BeanUtils.isNotEmpty(param.get("gangWei"))){
                             stringObjectHashMap.put("gangWei", String.join(",", (ArrayList)param.get("gangWei")));
                         }
+                        //增加是否带入公用评估项的配置
+                        if (Boolean.TRUE.equals(param.get("withDefConf"))) {
+                            stringObjectHashMap.put("withDefConf",true);
+                        } else {
+                            // 其余都为 false
+                            stringObjectHashMap.put("withDefConf",false);
+                        }
                     }
                 }
 

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/UpdateDataTableMapper.xml

@@ -889,6 +889,9 @@
                 <foreach collection="map.gangWei.split(',')" item="item" index="index" open="(" close=")" separator=" OR ">
                     gang_wei_ LIKE CONCAT('%', #{item}, '%')
                 </foreach>
+                <if test="map.withDefConf == true">
+                    OR (gang_wei_ IS NULL OR gang_wei_ = '')
+                </if>
                 )
             </if>
             <if test="@o.Ognl@isEmpty(map.gangWei)">
@@ -910,6 +913,9 @@
                 <foreach collection="map.gangWei.split(',')" item="item" index="index" open="(" close=")" separator=" OR ">
                     gang_wei_ LIKE CONCAT('%', #{item}, '%')
                 </foreach>
+                <if test="map.withDefConf == true">
+                    OR (gang_wei_ IS NULL OR gang_wei_ = '')
+                </if>
                 )
             </if>
             <if test="@o.Ognl@isEmpty(map.gangWei)">