Merge remote-tracking branch 'origin/dev_2.6.0' into dev_2.6.0

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -1774,8 +1774,6 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
 
         scheduler.scheduleJob(jobDetail, trigger);
     }
-
-
     /* Private Methods */
 
     /**
@@ -1872,11 +1870,17 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         }
         if (StringHelper.isNotEmpty(queryParam.getOrgId())) {
 //            queryWrapper.eq(THazardWorkPlan.ORG_ID,queryParam.getOrgId());
-            List<String> idsChildrenById = newSysOrgService.getIdsChildrenById(queryParam.getOrgId());
+            /*List<String> idsChildrenById = newSysOrgService.getIdsChildrenById(queryParam.getOrgId());
 
             idsChildrenById.add(queryParam.getOrgId());
             //查询下级机构id
-            queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);
+            queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);*/
+
+            List<String> list = Arrays.stream(queryParam.getOrgId().split(","))
+                    .filter(s -> !s.trim().isEmpty()) // 忽略空值
+                    .collect(Collectors.toList());
+            //查询下级机构id
+            queryWrapper.in(THazardWorkPlan.ORG_ID, list);
         }
         if (StringHelper.isNotEmpty(queryParam.getStatus())) {
             queryWrapper.eq(THazardWorkPlan.STATUS, queryParam.getStatus());

zlmy-modules/zlmy-boot/src/main/resources/license.dat

-uc3Y29XJfVtZtZTbmFMG43W0S1ww7Pm9qpwc0X2ZWNWU95hbBuM1tDtewOz0ru7ssi9DFexoGvcz6LmxpyoCuc2Y2VWQ9VfayMjMTImxpY3Cuc2Y2VHlwVfd0cmZT1ApjlhbhdGcmVGF0VfZyMDZT0TA2I1LzCmLTAF9kVuZlPTYXRjUtIwMtMDMDkFdfMKVvZHUHJF9OVjdlPVYW1mdXRvbKVFZWImVydfVvblc2lW1i9Od9NyZXIkUK4wLfQ1VFd0NPBVXUPQVU5W5kpia9ClaXA0hhRXX3YXcmR0lkJlXUV1PQpXhf9NYtYmTnVS0xVyPheFCk1W1i9OdfTGZXJXQ9ltawClMS40VkRXXpb2aXRW1i49RKTkZWQ1ZFVXXJT0UlNElD5fTDRTRU5VZN1OOaekejl3Q3pCSabXWTVllPVKT0S2MnIHdF5jOLMWSDN05qY5UxcTQzQk9sBSbyM2cVFnhJ8rblTWTDdEMzd0V3VVRjdVdqFMMOSlUHFmxFU2SiUVcTRnlmJLVCWGTEl1g5tmM6U2S1ZjFIF5anU1Zk50tYRuS2bHZTQgpOoxbfVkRVd0lPVSUMSUTl9kNFNFT0M2PUtUpjc3OuejdzdHdDRjSodlQ0V0ZYBicFVUMkZ3Rp8yTOalY0V3FOMzb4aUVVAXFLEvYZVzbDd3VolkY1cDeUYFh3NtRHSEME929NIrbxblSno3loJiUmTWVjBWY4xGSaK1UjJWtOMwSZVWU05UtvdaYyZ2cWcVhGdLVrCkNWM19W5FVTSURVJ0xJ9OXOQ0Q0VndlU9aCRzS1FmgrJ5WZd1bnFEMzNsUwa1VGc1ordCKIT1T2lmg0RKRnc1SFdTlOM5QpNVREpEllV1Z3ZXMGEHdsdPcNL0NnVm5Jt2NvZlRUw054I5ZqdUc1JW1CdhUYS1TWxVFscyTyRURTJlFo9nc5RXS25GIyN6T2SFLzAHEKJOWXX1TkVlNJZFUfTET05U5DlDR2bHRT1mRQlVawK2Z3k09YtVU5eWWVBVBz1IZSWXSEtTVogrbkVDbkhFdvAwWqQ1a250xkRNZ2elUm9kdyQ5Q2RWbVJ3hVVacJTEZG1VA2tIewMycGNGh6t1VUL3M1dDcylHaxRTKyszZOVDZwK1NmlDE2dPdRdnLzhFYwV6S3RQWVJVdfpORSU0VkVl9MlPTFTkSUN1NVNFXJUXTj1mJaEzMuV1b0F3pIJhNBUEUGxlpz1kbrdXSjg1VMM5TROVcmNzNhhzMQV3SWRjAyl6YiaUZlRzdoJBczSGUTgkV3gydUbCd29XdZsxOFaXTWl2k3VRY3eXNUMXg1ZQNyL2RkgDRi81TOVlMHJWNmphTwc1VnMmlFcvQrMwNDYVdfpORSU0VkVl9MlPTFTkSUN1NVNFXiaWTj1zRPFpcMUFUU51d2JuaKQWK2ZnpXRpY2eFUHEWxrZYMHRXVHBEc4hsN3ZkTlMkFY5DSxc3amNUV5gwMqYnQ2lGlNl6WlYmdzFkJnFJMpT2SFdFR0lkNKVUZHJTFo9JWvcUMnhmdpFrapaFRk90xRkyL1d3R20DNLlnVLZQbk5VdfpORSU0VkVl9MlPTFTkSUN1NVNFXINWTj1DE1hNWBUDbTRWNhVrSLbDVGJUZxRrQHZkemV21wlSdlR2WHhEFRZiM5czM3F1lGhyLrV0Z0Z3NjlIYyL3TnpzBnNocraCMXh0NZ9Hd3N0dHNXdHE3c2SlMUlk0vlnR3RydTdVoztST2cSNFgGt3tGUoS1eGR04xpXMGNAdnFVdfpORSU0VkVl9MlPTFTkSUN1NVNFXtNETj1ngrQyThUjZmlzFlg2R5TSTjR0p69uRLYUWkV2VpNtTJQnVGlEJic4crOUcXQG1vlIdDTGTzB2V6twbsSkZ3FVRt1uZTcWbjRVJXdQNsSHSjlTRDZyYYb2U3VFhLticNT0bjZkNl5WNwZmSlJHpt9oNlV3dDlWVzQ4VMQQQXF   o= 
\ No newline at end of file
+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   o= 
\ No newline at end of file