承包商多选bug修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/contractor/manage/controller/TContractorSafetyBriefController.java

@@ -40,6 +40,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 承包商管理-安全交底Controller
@@ -276,7 +277,15 @@ public class TContractorSafetyBriefController extends SuperController
 		idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
 		log.info("承包商人员台账列表--ids2------>ids值:{}",idsChildrenById);
 		//查询下级机构id
-		queryWrapper.in("org_id", idsChildrenById);
+		//queryWrapper.in("org_id", idsChildrenById);
+		String inIds = idsChildrenById.stream()
+				.map(id -> "'" + id + "'")
+				.collect(Collectors.joining(","));
+
+		queryWrapper.apply(
+				"string_to_array(org_id, ',') && ARRAY[" + inIds + "]"
+		);
+
 
 		if(StringHelper.isNotEmpty(queryParam.getContractorId())){
 			queryWrapper.eq(TContractorSafetyBrief.CONTRACTOR_ID,queryParam.getContractorId());

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorAcceptance.xml

@@ -42,7 +42,7 @@
         </where>-->
         WHERE EXISTS (
         SELECT 1
-        FROM unnest(string_to_array(tca.org_id, ',')) AS org(id)
+        FROM unnest(string_to_array(tcl.org_id, ',')) AS org(id)
         JOIN t_sys_org o ON org.id = o.org_id
         WHERE
         o.parent_ids LIKE concat('%',#{param.orgId},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorAllow.xml

@@ -42,7 +42,7 @@
         <!--where tca.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
         WHERE EXISTS (
         SELECT 1
-        FROM unnest(string_to_array(tca.org_id, ',')) AS org(id)
+        FROM unnest(string_to_array(tcl.org_id, ',')) AS org(id)
         JOIN t_sys_org o ON org.id = o.org_id
         WHERE
         o.parent_ids LIKE concat('%',#{param.orgId},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorBasicInfo.xml

@@ -68,7 +68,7 @@
         tcbi.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
         WHERE EXISTS (
         SELECT 1
-        FROM unnest(string_to_array(tcbi.org_id, ',')) AS org(id)
+        FROM unnest(string_to_array(tcl.org_id, ',')) AS org(id)
         JOIN t_sys_org o ON org.id = o.org_id
         WHERE
         o.parent_ids LIKE concat('%',#{param.orgId},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorBlacklist.xml

@@ -53,7 +53,7 @@
         t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
         WHERE EXISTS (
         SELECT 1
-        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        FROM unnest(string_to_array(tcl.org_id, ',')) AS org(id)
         JOIN t_sys_org o ON org.id = o.org_id
         WHERE
         o.parent_ids LIKE concat('%',#{param.orgId},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorConditionReview.xml

@@ -45,7 +45,7 @@
         t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
         WHERE EXISTS (
         SELECT 1
-        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        FROM unnest(string_to_array(tcl.org_id, ',')) AS org(id)
         JOIN t_sys_org o ON org.id = o.org_id
         WHERE
         o.parent_ids LIKE concat('%',#{param.orgId},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorDailyPlan.xml

@@ -57,7 +57,7 @@
         </where>-->
         WHERE EXISTS (
         SELECT 1
-        FROM unnest(string_to_array(tcdp.org_id, ',')) AS org(id)
+        FROM unnest(string_to_array(tcl.org_id, ',')) AS org(id)
         JOIN t_sys_org o ON org.id = o.org_id
         WHERE
         o.parent_ids LIKE concat('%',#{param.orgId},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorEvaluate.xml

@@ -62,7 +62,7 @@
         t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
         WHERE EXISTS (
         SELECT 1
-        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        FROM unnest(string_to_array(tcl.org_id, ',')) AS org(id)
         JOIN t_sys_org o ON org.id = o.org_id
         WHERE
         o.parent_ids LIKE concat('%',#{param.orgId},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorPreparation.xml

@@ -62,7 +62,7 @@
             t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
         WHERE EXISTS (
         SELECT 1
-        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        FROM unnest(string_to_array(tcl.org_id, ',')) AS org(id)
         JOIN t_sys_org o ON org.id = o.org_id
         WHERE
         o.parent_ids LIKE concat('%',#{param.orgId},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorSafetyBrief.xml

@@ -53,7 +53,7 @@
         t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
         WHERE EXISTS (
         SELECT 1
-        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        FROM unnest(string_to_array(tcl.org_id, ',')) AS org(id)
         JOIN t_sys_org o ON org.id = o.org_id
         WHERE
         o.parent_ids LIKE concat('%',#{param.orgId},'%')