From 90d81ccdca26b36e76baa6936a493b6d40db705b Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Tue, 13 Jan 2026 11:52:28 +0800 Subject: [PATCH] 巡检养护集合增加数据隔离 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java | 29 +++++++++++++++++------------ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java | 4 +++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java | 28 ++++++++++++++++------------ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java | 5 ++++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java | 3 ++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java | 3 ++- 6 files changed, 44 insertions(+), 28 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java index 7d4dda7..0c666fd 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java @@ -1,6 +1,7 @@ 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> 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 pageResult = inspectionPlanService.getInspectionPlanPage(pageReqVO); return success(pageResult); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java index a1ce769..ad3053d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java @@ -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 deptIds; +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java index 2e999d0..4960c86 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java @@ -1,6 +1,7 @@ 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> 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 pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO); return success(pageResult); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java index 546f05b..bc2e044 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java @@ -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 deptIds; + +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java index f7b3497..9550e41 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java @@ -31,7 +31,8 @@ public interface InspectionPlanInterceptMapper extends BaseMapperX .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 +} -- libgit2 0.21.4