增加判断登录人是否有查看检查记录的权限接口

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/other/EnforceObjArchitectureRelateController.java

@@ -69,6 +69,12 @@ public class EnforceObjArchitectureRelateController extends BaseController {
         return R.fail("查询不到关联的建筑信息");
     }
 
+    @ApiOperation(value="判断登录人是否有查看检查记录的权限")
+    @GetMapping("/enforceObjArchitectureRelate/checkRecordAuth/{regionId}")
+    public R<Boolean> checkRecordAuth(@PathVariable String regionId) {
+        return R.ok(enforceObjArchitectureRelateService.checkRecordAuth(regionId));
+    }
+
     @ApiOperation(value="查询高楼码关联的单位记录列表")
     @GetMapping("/enforceObjArchitectureRelate/list")
     public R<List<EnforceObjCheckDTO>> getEnforceObjList(EnforceObjArchitectureRelateQuery query) {

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/EnforceObjArchitectureRelateServiceImpl.java

@@ -107,20 +107,6 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
     @Override
     public List<EnforceObjCheckDTO> getEnforceObjList(EnforceObjArchitectureRelateQuery query) {
         List<EnforceObjCheckDTO> list = new ArrayList<>();
-        String orgId = SecurityUtils.getOrgId();
-        List<SysDept> sysDepts = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
-                .select(SysDept::getRegionCode, SysDept::getParentId)
-                .eq(SysDept::getEnforceOrgId, orgId));
-        if (CollectionUtils.isEmpty(sysDepts)) return list;
-        List<String> regionIds = sysDepts.stream().map(SysDept::getRegionCode).collect(Collectors.toList());
-        List<String> updatedRegionIds = regionIds.stream()
-                .map(regionId -> regionId + "000000")
-                .collect(Collectors.toList());
-        List<Long> parentIds = sysDepts.stream().map(SysDept::getParentId).collect(Collectors.toList());
-        //非建筑所属辖区或非总队无权限查看
-        if (!updatedRegionIds.contains(query.getRegionId()) && !parentIds.contains(0L)) {
-            return list;
-        }
         List<String> enforceObjIds = enforceObjArchitectureRelateMapper.getEnforceObjIds(query);
         if (CollectionUtils.isNotEmpty(enforceObjIds)) {
             list = enforceObjArchitectureRelateMapper.getEnforceObjList(enforceObjIds);
@@ -195,5 +181,24 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
         return list;
     }
 
+    @Override
+    public Boolean checkRecordAuth(String regionId) {
+        String orgId = SecurityUtils.getOrgId();
+        List<SysDept> sysDepts = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
+                .select(SysDept::getRegionCode, SysDept::getParentId)
+                .eq(SysDept::getEnforceOrgId, orgId));
+        if (CollectionUtils.isEmpty(sysDepts)) return false;
+        List<String> sysDeptRegionIds = sysDepts.stream().map(SysDept::getRegionCode).collect(Collectors.toList());
+        List<String> updatedRegionIds = sysDeptRegionIds.stream()
+                .map(sysDeptRegionId -> sysDeptRegionId + "000000")
+                .collect(Collectors.toList());
+        List<Long> parentIds = sysDepts.stream().map(SysDept::getParentId).collect(Collectors.toList());
+        //非建筑所属辖区或非总队无权限查看
+        if (!updatedRegionIds.contains(regionId) && !parentIds.contains(0L)) {
+            return false;
+        }
+        return true;
+    }
+
 
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/other/IEnforceObjArchitectureRelateService.java

@@ -21,5 +21,6 @@ public interface IEnforceObjArchitectureRelateService extends IService<EnforceOb
     boolean insertEnforceObjArchitectureRelate(EnforceObjArchitectureRelateAdd add);
     boolean updateEnforceObjArchitectureRelate(EnforceObjArchitectureRelateUpdate param);
     List<EnforceObjCheckDTO> getEnforceObjList(EnforceObjArchitectureRelateQuery query);
+    Boolean checkRecordAuth(String regionId);
 
 }