承包商所属企业多选

东北港口平台大区发起危险作业走的流程和散粮部一样

zlmy-modules/zlmy-boot/doc/v2.6.0/修改记录.md

@@ -228,3 +228,14 @@ su.login_pwd AS PWD_,
 NULL :: text AS PICTURE_ID_
 FROM
 t_sys_user su;
+
+
+
+# 待上线
+# 承包商所属企业多选
+ALTER TABLE t_contractor_ledger
+ALTER COLUMN org_id TYPE TEXT;
+
+# 东北港口平台大区发起危险作业走的流程和散粮部一样
+update t_sys_config set config_value = '51555a47ff6a42c0a75814fee3e60676,5c7b5e799ae6482bae0ca375e64210de,640323dc46334c8d8467a6d1889f90b1,74ba35d937a3403ca59e37d238a0d93f,bf729a8807ae4804baf5b719889a1b10,dafc181b7b314f8fb26c277afcbfeafc,8be46ac128e24c658ebc890f9da7818a,1335dbc3f81b4919bf59014fede4819d'
+where config_id = '1'
\ No newline at end of file

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysOrgController.java

@@ -548,7 +548,7 @@ public class NewSysOrgController extends SuperController {
 
         for(SysOrg org : list) {
             ReturnOrg returnOrg1 = BeanHelper.beanToBean(org, ReturnOrg.class);
-            List<SysUser> list1 = this.sysUserService.list(new QueryWrapper<SysUser>().eq("dept_id", returnOrg1.getOrgId()).ne("status", "1"));
+            List<SysUser> list1 = this.sysUserService.list(new QueryWrapper<SysUser>().eq("dept_id", returnOrg1.getOrgId()).eq("status", "0"));
             returnOrg1.setUsers(list1);
             returnOrgs.add(returnOrg1);
         }

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/ledger/TContractorLedger.xml

@@ -33,10 +33,23 @@
                 <id column="man_policies" property="manPolicies"/>
     </resultMap>
     <select id="pageList" resultType="com.testor.module.contractor.ledger.model.domain.TContractorLedger">
-        select t.* from t_contractor_ledger t left join t_contractor_info tci on t.info_id=tci.id
+        <!--select t.* from t_contractor_ledger t left join t_contractor_info tci on t.info_id=tci.id
         where 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})
-          and t.status = '0'
+          and t.status = '0'-->
+
+        SELECT t.*
+        FROM t_contractor_ledger t
+        LEFT JOIN t_contractor_info tci ON t.info_id = tci.id
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
+        WHERE
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
+        AND t.status = '0'
         <if test="param.name != null and param.name != ''">
             AND tci.name like concat('%',#{param.name},'%')
         </if>