标准规则库

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/SuperviseRuleServiceImpl.java

@@ -38,29 +38,34 @@ public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,Super
         Long superviseDeptId = superviseRule.getSuperviseDeptId();
         Long inspectionUnitId = superviseRule.getInspectionUnitId();
         LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
-        if(!ValidationUtil.isEmpty(adminRegionCode)){
-            wrapper.eq(SuperviseRule::getAdminRegionCode,adminRegionCode);
-        }
-        if(!ValidationUtil.isEmpty(superviseDeptId)){
-            wrapper.like(SuperviseRule::getSuperviseDeptId,superviseDeptId);
-        }
-        if(!ValidationUtil.isEmpty(inspectionUnitId)){
-            wrapper.like(SuperviseRule::getInspectionUnitId,inspectionUnitId);
+        if(ValidationUtil.isEmpty(adminRegionCode)){
+            return null;
+        }else {
+//        if(!ValidationUtil.isEmpty(adminRegionCode)){
+//            wrapper.eq(SuperviseRule::getAdminRegionCode, adminRegionCode);
+//        }
+            wrapper.eq(SuperviseRule::getAdminRegionCode, adminRegionCode);
         }
+            if (!ValidationUtil.isEmpty(superviseDeptId)) {
+                wrapper.like(SuperviseRule::getSuperviseDeptId, superviseDeptId);
+            }
+            if (!ValidationUtil.isEmpty(inspectionUnitId)) {
+                wrapper.like(SuperviseRule::getInspectionUnitId, inspectionUnitId);
+            }
+            page = this.page(page, wrapper);
+            List<SuperviseRule> superviseRuleList = page.getRecords();
+            List<SuperviseRuleDto> superviseRuleDtoList = new ArrayList<>();
+            for (SuperviseRule rule : superviseRuleList) {
+                SuperviseRuleDto superviseRuleDto = new SuperviseRuleDto();
+                BeanUtils.copyProperties(rule, superviseRuleDto);
+                superviseRuleDto.setSuperviseDept(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getSuperviseDeptId())).getBizOrgName());
+                superviseRuleDto.setInspectionUnit(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getInspectionUnitId())).getBizOrgName());
+                superviseRuleDto.setCreateUnit(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getCreateUnitId())).getBizOrgName());
+                superviseRuleDtoList.add(superviseRuleDto);
+            }
+            page.setRecords(superviseRuleDtoList);
+            return page;
 
-        page = this.page(page,wrapper);
-        List<SuperviseRule> superviseRuleList = page.getRecords();
-        List<SuperviseRuleDto> superviseRuleDtoList = new ArrayList<>();
-        for(SuperviseRule rule: superviseRuleList){
-            SuperviseRuleDto superviseRuleDto = new SuperviseRuleDto();
-            BeanUtils.copyProperties(rule,superviseRuleDto);
-            superviseRuleDto.setSuperviseDept(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getSuperviseDeptId())).getBizOrgName());
-            superviseRuleDto.setInspectionUnit(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getInspectionUnitId())).getBizOrgName());
-            superviseRuleDto.setCreateUnit(orgServiceImpl.getOrgUsrById(String.valueOf(rule.getCreateUnitId())).getBizOrgName());
-            superviseRuleDtoList.add(superviseRuleDto);
-        }
-        page.setRecords(superviseRuleDtoList);
-        return page;
     }
 
     /**