Commit 3c5a982c5a484abc04e45758ec5a7e7b1a07e6d4
1 parent
517d7fca
工单分页查询增加部门及部门以下数据权限
Showing
3 changed files
with
22 additions
and
1 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java
| 1 | package com.zteits.urbanops.module.workorder.controller.admin.maininfo; | 1 | package com.zteits.urbanops.module.workorder.controller.admin.maininfo; |
| 2 | 2 | ||
| 3 | import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; | 3 | import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; |
| 4 | +import com.zteits.urbanops.framework.common.biz.system.permission.PermissionCommonApi; | ||
| 5 | +import com.zteits.urbanops.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO; | ||
| 4 | import com.zteits.urbanops.framework.common.pojo.CommonResult; | 6 | import com.zteits.urbanops.framework.common.pojo.CommonResult; |
| 5 | import com.zteits.urbanops.framework.common.pojo.PageParam; | 7 | import com.zteits.urbanops.framework.common.pojo.PageParam; |
| 6 | import com.zteits.urbanops.framework.common.pojo.PageResult; | 8 | import com.zteits.urbanops.framework.common.pojo.PageResult; |
| 7 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; | 9 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; |
| 10 | +import com.zteits.urbanops.framework.datapermission.core.rule.dept.DeptDataPermissionRule; | ||
| 8 | import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; | 11 | import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; |
| 12 | +import com.zteits.urbanops.framework.security.core.LoginUser; | ||
| 13 | +import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; | ||
| 9 | import com.zteits.urbanops.module.bpm.api.task.BpmTaskApi; | 14 | import com.zteits.urbanops.module.bpm.api.task.BpmTaskApi; |
| 10 | import com.zteits.urbanops.module.bpm.api.task.dto.BpmUserSimpleReqDTO; | 15 | import com.zteits.urbanops.module.bpm.api.task.dto.BpmUserSimpleReqDTO; |
| 11 | import com.zteits.urbanops.module.system.api.user.AdminUserApi; | 16 | import com.zteits.urbanops.module.system.api.user.AdminUserApi; |
| @@ -39,6 +44,7 @@ import java.util.stream.Collectors; | @@ -39,6 +44,7 @@ import java.util.stream.Collectors; | ||
| 39 | import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT; | 44 | import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT; |
| 40 | import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; | 45 | import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; |
| 41 | import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getBusiLine; | 46 | import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getBusiLine; |
| 47 | +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId; | ||
| 42 | 48 | ||
| 43 | @Tag(name = "管理后台 - 工单信息") | 49 | @Tag(name = "管理后台 - 工单信息") |
| 44 | @RestController | 50 | @RestController |
| @@ -58,6 +64,11 @@ public class MainInfoController { | @@ -58,6 +64,11 @@ public class MainInfoController { | ||
| 58 | private AdminUserApi adminUserApi; | 64 | private AdminUserApi adminUserApi; |
| 59 | @Resource | 65 | @Resource |
| 60 | private BpmTaskApi bpmTaskApi; | 66 | private BpmTaskApi bpmTaskApi; |
| 67 | + @Resource | ||
| 68 | + private PermissionCommonApi permissionApi; | ||
| 69 | + | ||
| 70 | + protected static final String CONTEXT_KEY = DeptDataPermissionRule.class.getSimpleName(); | ||
| 71 | + | ||
| 61 | 72 | ||
| 62 | @PostMapping("/create") | 73 | @PostMapping("/create") |
| 63 | @Operation(summary = "创建工单信息") | 74 | @Operation(summary = "创建工单信息") |
| @@ -140,6 +151,13 @@ public class MainInfoController { | @@ -140,6 +151,13 @@ public class MainInfoController { | ||
| 140 | public CommonResult<PageResult<AdminMainInfoRespVO>> getMainInfoPage(@Valid MainInfoPageReqVO pageReqVO) { | 151 | public CommonResult<PageResult<AdminMainInfoRespVO>> getMainInfoPage(@Valid MainInfoPageReqVO pageReqVO) { |
| 141 | //登录人所属业务线 | 152 | //登录人所属业务线 |
| 142 | pageReqVO.setBusiLine(getBusiLine()); | 153 | pageReqVO.setBusiLine(getBusiLine()); |
| 154 | + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); | ||
| 155 | + if (loginUser == null) { | ||
| 156 | + return null; | ||
| 157 | + } | ||
| 158 | + //获取登录人权限 | ||
| 159 | + DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(loginUser.getId()); | ||
| 160 | + pageReqVO.setDeptIds(deptDataPermission.getDeptIds()); | ||
| 143 | PageResult<MainInfoDO> pageResult = mainInfoService.getMainInfoPage(pageReqVO); | 161 | PageResult<MainInfoDO> pageResult = mainInfoService.getMainInfoPage(pageReqVO); |
| 144 | 162 | ||
| 145 | if (pageResult == null) { | 163 | if (pageResult == null) { |
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoPageReqVO.java
| @@ -127,5 +127,7 @@ public class MainInfoPageReqVO extends PageParam { | @@ -127,5 +127,7 @@ public class MainInfoPageReqVO extends PageParam { | ||
| 127 | 127 | ||
| 128 | @Schema(description = "工单来源编码") | 128 | @Schema(description = "工单来源编码") |
| 129 | private String woSourceId; | 129 | private String woSourceId; |
| 130 | + @Schema(description = "部门id") | ||
| 131 | + private Set<Long> deptIds; | ||
| 130 | 132 | ||
| 131 | -} | ||
| 132 | \ No newline at end of file | 133 | \ No newline at end of file |
| 134 | +} |
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
| @@ -79,6 +79,7 @@ public interface MainInfoMapper extends BaseMapperX<MainInfoDO> { | @@ -79,6 +79,7 @@ public interface MainInfoMapper extends BaseMapperX<MainInfoDO> { | ||
| 79 | .likeIfPresent(MainInfoDO::getRemark, reqVO.getRemark()) | 79 | .likeIfPresent(MainInfoDO::getRemark, reqVO.getRemark()) |
| 80 | .likeIfPresent(MainInfoDO::getHandleResult, reqVO.getHandleResult()) | 80 | .likeIfPresent(MainInfoDO::getHandleResult, reqVO.getHandleResult()) |
| 81 | .betweenIfPresent(MainInfoDO::getCreateTime, reqVO.getCreateTime()) | 81 | .betweenIfPresent(MainInfoDO::getCreateTime, reqVO.getCreateTime()) |
| 82 | + .inIfPresent(MainInfoDO::getDeptId, reqVO.getDeptIds()) | ||
| 82 | .orderByDesc(MainInfoDO::getId); | 83 | .orderByDesc(MainInfoDO::getId); |
| 83 | return selectPage(reqVO, queryWrapper); | 84 | return selectPage(reqVO, queryWrapper); |
| 84 | } | 85 | } |