承包商人员台账bug修改

上线数据库脚本增加

zlmy-modules/zlmy-boot/doc/国产化/上线说明.md

@@ -115,3 +115,16 @@ SELECT TABLE_NAME AS view_name  FROM information_schema.views  WHERE TABLE_SCHEM
 # 下次上线(标记于20250710)
 ALTER TABLE public.t_accident_report ALTER COLUMN report_unit TYPE varchar(1000) USING report_unit::varchar;
 ALTER TABLE public.t_accident_report ALTER COLUMN attachment TYPE varchar(1000) USING attachment::varchar;
+
+
+
+
+# 北良按部门指定流程图
+update t_sys_config set status = '1' where config_id in('1','2');
+
+INSERT INTO "public"."t_sys_config" ("config_id", "config_name", "config_key", "config_value", "config_type", "status", "create_by", "create_date", "update_by", "update_date", "remarks") VALUES ('3', '北良公司-公司级机构ids', 'sys.beiliang.orgs', '74ba35d937a3403ca59e37d238a0d93f,dafc181b7b314f8fb26c277afcbfeafc,bf729a8807ae4804baf5b719889a1b10,640323dc46334c8d8467a6d1889f90b1,8be46ac128e24c658ebc890f9da7818a
+,71ccfa9b528c43eba3c374990472c5f4,703c7a0dbbe84d768bcb175905d3140d,a072abc298464c32a66761acbbf851be', 'N', '0', NULL, '2024-12-24 15:29:54', NULL, '2024-12-24 15:29:54', NULL);
+INSERT INTO "public"."t_sys_config" ("config_id", "config_name", "config_key", "config_value", "config_type", "status", "create_by", "create_date", "update_by", "update_date", "remarks") VALUES ('4', '北良公司-部门级机构ids', 'sys.beiliang.depts', 'bc8047cac1214b558ed9465a92cf3f27,51555a47ff6a42c0a75814fee3e60676,97180fe2554b4f2a9ec6d1cf213b7f67,ef4e50ad1da64b9ba0e9c894faca4487,b66916fcfad44412a17aa3f641cd2ad5
+,b828ca4431854e699195888466057955,e5a463b08c9d4e54bd47ed416941380c,7ba23b0151cb49578cd3abd5ceea72ac,d4185815c13544c3950416d77cd6d65c,164b5cf61efe4a269911e2097eb997f9
+,49d90fa9ddac4b94928afc126f72161c,b5e5a052640f4a5b82b0ce7ef0f31bb0,b82dc615aecb4b2dae28d82ce8eb4693,bed4208a45254ff8b072e3737cdbe85f,c4396dd90e964a208a9992186632ff59
+,5c7b5e799ae6482bae0ca375e64210de,6f7549e8402643beb79e4f726722ed27,6ceddfaddf20442ca861f58ecb139012,311ee5aebc884803a0d0e1353db805cd,1335dbc3f81b4919bf59014fede4819d', 'N', '0', NULL, '2024-12-24 15:29:54', NULL, '2024-12-24 15:29:54', NULL);

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/contractor/ledger/service/impl/TContractorPersonServiceImpl.java

@@ -420,7 +420,10 @@ public class TContractorPersonServiceImpl extends SuperServiceImpl<TContractorPe
 //        }
         //List<String> ids = newSysOrgService.getIdsChildrenById(orgId);
         List<String> ids = new ArrayList<>();
-        ids.addAll(Arrays.asList(contractorLedgerDao.orgIdDistinct(orgId).split(",")));
+        String orgIds = contractorLedgerDao.orgIdDistinct(orgId);
+        if(null != orgIds){
+            ids.addAll(Arrays.asList(orgIds.split(",")));
+        }
         log.info("承包商人员台账列表--ids1------>ids值:{}",ids);
         ids.addAll(newSysOrgService.getIdsChildrenById(orgId));
         log.info("承包商人员台账列表--ids2------>ids值:{}",ids);