巡检养护集合增加数据隔离

wangqian
1 parent 3c5a982c
Showing 6 changed files with 44 additions and 28 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/inspectionplan/vo/InspectionPlanPageReqVO.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/maintainplan/vo/MaintainPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan;
 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import com.zteits.urbanops.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
@@ -125,18 +126,22 @@ 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){
-            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
-                pageReqVO.setCompanyId( null);
-            }else{
-                Long companyId = SecurityFrameworkUtils.getCompanyId();
-                if(null == companyId || companyId == 0L || companyId == 100L){
-                    companyId = null;
-                }
-                pageReqVO.setCompanyId(companyId);
-            }
-        }
+//        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+//        if(pageReqVO.getCompanyId() == null){
+//            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
+//                pageReqVO.setCompanyId( null);
+//            }else{
+//                Long companyId = SecurityFrameworkUtils.getCompanyId();
+//                if(null == companyId || companyId == 0L || companyId == 100L){
+//                    companyId = null;
+//                }
+//                pageReqVO.setCompanyId(companyId);
+//            }
+//        }
+
+        //获取登录人权限
+        DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setDeptIds(deptDataPermission.getDeptIds());
         PageResult<InspectionPlanRespVO> pageResult = inspectionPlanService.getInspectionPlanPage(pageReqVO);
         return success(pageResult);
     }
@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import java.util.Set;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -52,4 +53,5 @@ public class InspectionPlanPageReqVO extends PageParam {
     @Schema(description = "完成状态	: 1:未完成；2:已完成")
     private Integer finishState;
-}
 \ No newline at end of file
+    private Set<Long> deptIds;
+}
 package com.zteits.urbanops.module.garden.controller.admin.maintainplan;
 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import com.zteits.urbanops.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
@@ -124,18 +125,21 @@ public class MaintainPlanController {
     @Operation(summary = "获得养护计划汇总分页")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')")
     public CommonResult<PageResult<MaintainPlanRespVO>> getMaintainPlanPage(@Valid MaintainPlanPageReqVO pageReqVO) {
-        if(pageReqVO.getCompanyId() == null){
-            Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
-            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
-                pageReqVO.setCompanyId( null);
-            }else{
-                Long companyId = SecurityFrameworkUtils.getCompanyId();
-                if(null == companyId || companyId == 0L || companyId == 100L){
-                    companyId = null;
-                }
-                pageReqVO.setCompanyId(companyId);
-            }
-        }
+//        if(pageReqVO.getCompanyId() == null){
+//            Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+//            if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
+//                pageReqVO.setCompanyId( null);
+//            }else{
+//                Long companyId = SecurityFrameworkUtils.getCompanyId();
+//                if(null == companyId || companyId == 0L || companyId == 100L){
+//                    companyId = null;
+//                }
+//                pageReqVO.setCompanyId(companyId);
+//            }
+//        }
+        //获取登录人权限
+        DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setDeptIds(deptDataPermission.getDeptIds());
         PageResult<MaintainPlanRespVO> pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO);
         return success(pageResult);
     }
@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import java.util.Set;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -53,4 +54,6 @@ public class MaintainPlanPageReqVO extends PageParam {
     @Schema(description = "完成状态	: 1:未完成；2:已完成")
     private Integer finishState;
-}
 \ No newline at end of file
+    private Set<Long> deptIds;
+
+}
@@ -31,7 +31,8 @@ public interface InspectionPlanInterceptMapper extends BaseMapperX&lt;InspectionPla
                 .eqIfPresent(InspectionPlanDO::getFinishState, reqVO.getFinishState())
                 .betweenIfPresent(InspectionPlanDO::getBeginTime, reqVO.getBeginTime())
                 .betweenIfPresent(InspectionPlanDO::getEndTime, reqVO.getEndTime())
+                .inIfPresent(InspectionPlanDO::getDeptId, reqVO.getDeptIds())
                 .orderByDesc(InspectionPlanDO::getId));
     }
-}
 \ No newline at end of file
+}
@@ -33,7 +33,8 @@ public interface MaintainPlanInterceptMapper extends BaseMapperX&lt;MaintainPlanDO&gt;
                 .betweenIfPresent(MaintainPlanDO::getBeginTime, reqVO.getBeginTime())
                 .betweenIfPresent(MaintainPlanDO::getEndTime, reqVO.getEndTime())
                 .eq(MaintainPlanDO::getDeleted,0)
+                .inIfPresent(MaintainPlanDO::getDeptId, reqVO.getDeptIds())
                 .orderByDesc(MaintainPlanDO::getId));
     }
-}
 \ No newline at end of file
+}