养护计划优化提交

王富生
1 parent 612fc4ea
Showing 3 changed files with 31 additions and 3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java
@@ -5,6 +5,7 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.framework.datapermission.core.util.DataPermissionUtils;
 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanPageReqVO;
@@ -13,6 +14,7 @@ import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.Insp
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanUpdateReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
 import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanService;
+import com.zteits.urbanops.module.system.api.permission.PermissionApi;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -43,6 +45,9 @@ public class InspectionPlanController {
     @Resource
     private InspectionPlanService inspectionPlanService;
+    @Resource
+    private PermissionApi permissionApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建巡检计划汇总")
     @PreAuthorize("@ss.hasPermission('garden:inspection-plan:create')")
@@ -118,8 +123,13 @@ public class InspectionPlanController {
     @Operation(summary = "获得巡检计划汇总分页")
     @PreAuthorize("@ss.hasPermission('garden:inspection-plan:query')")
     public CommonResult<PageResult<InspectionPlanRespVO>> getInspectionPlanPage(@Valid InspectionPlanPageReqVO pageReqVO) {
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         if(pageReqVO.getCompanyId() == null){
-            pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
+                pageReqVO.setCompanyId( null);
+            }else{
+                pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+            }
         }
         PageResult<InspectionPlanRespVO> pageResult = inspectionPlanService.getInspectionPlanPage(pageReqVO);
         return success(pageResult);
@@ -13,6 +13,7 @@ import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.Mainta
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanUpdateReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO;
 import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanService;
+import com.zteits.urbanops.module.system.api.permission.PermissionApi;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -43,6 +44,9 @@ public class MaintainPlanController {
     @Resource
     private MaintainPlanService maintainPlanService;
+    @Resource
+    private PermissionApi permissionApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建养护计划汇总")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan:create')")
@@ -119,7 +123,12 @@ public class MaintainPlanController {
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')")
     public CommonResult<PageResult<MaintainPlanRespVO>> getMaintainPlanPage(@Valid MaintainPlanPageReqVO pageReqVO) {
         if(pageReqVO.getCompanyId() == null){
-            pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+            Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
+                pageReqVO.setCompanyId( null);
+            }else{
+                pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+            }
         }
         PageResult<MaintainPlanRespVO> pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO);
         return success(pageResult);
 package com.zteits.urbanops.module.garden.controller.admin.road;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.system.api.permission.PermissionApi;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +39,9 @@ public class RoadController {
     @Resource
     private RoadService roadService;
+    @Resource
+    private PermissionApi permissionApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建道路管理")
     @PreAuthorize("@ss.hasPermission('garden:road:create')")
@@ -84,7 +88,12 @@ public class RoadController {
     @PreAuthorize("@ss.hasPermission('garden:road:query')")
     public CommonResult<PageResult<RoadRespVO>> getRoadPage(@Valid RoadPageReqVO pageReqVO) {
         if(pageReqVO.getCompanyId() == null){
-            pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+            Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
+                pageReqVO.setCompanyId( null);
+            }else{
+                pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+            }
         }
         PageResult<RoadRespVO> pageResult = roadService.getRoadPage(pageReqVO);
         return success(pageResult);