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

wangqian
1 parent 90d81ccd
Showing 6 changed files with 41 additions and 3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanCommitController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan;
+import com.zteits.urbanops.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
+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;
@@ -37,6 +40,9 @@ public class InspectionPlanCommitController {
     @Resource
     private InspectionPlanCommitService inspectionPlanCommitService;
+    @Resource
+    private PermissionApi permissionApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建巡检计划提交明细")
     @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:create')")
@@ -83,6 +89,9 @@ public class InspectionPlanCommitController {
     @Operation(summary = "获得巡检计划提交明细分页")
     @PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:query')")
     public CommonResult<PageResult<InspectionPlanCommitRespVO>> getInspectionPlanCommitPage(@Valid InspectionPlanCommitPageReqVO pageReqVO) {
+        //获取登录人权限
+        DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setDeptIds(deptDataPermission.getDeptIds());
         PageResult<InspectionPlanCommitRespVO> pageResult = inspectionPlanCommitService.getInspectionPlanCommitPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, InspectionPlanCommitRespVO.class));
     }
@@ -100,4 +109,4 @@ public class InspectionPlanCommitController {
                         BeanUtils.toBean(list, InspectionPlanCommitRespVO.class));
     }
-}
 \ No newline at end of file
+}
@@ -4,6 +4,7 @@ import lombok.*;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Set;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
@@ -71,4 +72,6 @@ public class InspectionPlanCommitPageReqVO extends PageParam {
     @Schema(description = "创建结束时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate createTimeEnd;
-}
 \ No newline at end of file
+
+    private Set<Long> deptIds;
+}
 package com.zteits.urbanops.module.garden.controller.admin.maintainplan;
+import com.zteits.urbanops.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
+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;
@@ -37,6 +40,10 @@ public class MaintainPlanCommitController {
     @Resource
     private MaintainPlanCommitService maintainPlanCommitService;
+    @Resource
+    private PermissionApi permissionApi;
+
+
     @PostMapping("/create")
     @Operation(summary = "创建养护计划明细")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:create')")
@@ -92,6 +99,9 @@ public class MaintainPlanCommitController {
     @Operation(summary = "获得养护计划明细分页")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')")
     public CommonResult<PageResult<MaintainPlanCommitRespVO>> getMaintainPlanCommitPage(@Valid MaintainPlanCommitPageReqVO pageReqVO) {
+        //获取登录人权限
+        DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setDeptIds(deptDataPermission.getDeptIds());
         PageResult<MaintainPlanCommitRespVO> pageResult = maintainPlanCommitService.getMaintainPlanCommitPage(pageReqVO);
         return success(pageResult);
     }
@@ -109,4 +119,4 @@ public class MaintainPlanCommitController {
                         BeanUtils.toBean(list, MaintainPlanCommitRespVO.class));
     }
-}
 \ No newline at end of file
+}
@@ -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.util.List;
+import java.util.Set;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -68,4 +69,5 @@ public class MaintainPlanCommitPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate createTimeEnd;
+    private Set<Long> deptIds;
 }
@@ -94,6 +94,14 @@
         <if test="req.createTimeEnd != null">
         <![CDATA[AND DATE_FORMAT(a.create_time, '%Y-%m-%d') <= #{req.createTimeEnd}]]>
         </if>
+
+        <if test="req.deptIds != null and !req.deptIds.isEmpty()">
+            and b.dept_id in
+            <foreach collection="req.deptIds" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+
         order by a.id desc
     </select>
@@ -88,6 +88,12 @@
         <if test="req.createTimeEnd != null">
             <![CDATA[AND DATE_FORMAT(a.create_time, '%Y-%m-%d') <= #{req.createTimeEnd}]]>
         </if>
+        <if test="req.deptIds != null and !req.deptIds.isEmpty()">
+            and b.dept_id in
+            <foreach collection="req.deptIds" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
         order by c.id desc
     </select>