diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java index 23c2831..aa3ec2f 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java @@ -1,11 +1,16 @@ package com.zteits.urbanops.module.workorder.controller.admin.maininfo; import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import com.zteits.urbanops.framework.common.biz.system.permission.PermissionCommonApi; +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; import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import com.zteits.urbanops.framework.datapermission.core.rule.dept.DeptDataPermissionRule; import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; +import com.zteits.urbanops.framework.security.core.LoginUser; +import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; import com.zteits.urbanops.module.bpm.api.task.BpmTaskApi; import com.zteits.urbanops.module.bpm.api.task.dto.BpmUserSimpleReqDTO; import com.zteits.urbanops.module.system.api.user.AdminUserApi; @@ -39,6 +44,7 @@ import java.util.stream.Collectors; import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getBusiLine; +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId; @Tag(name = "管理后台 - 工单信息") @RestController @@ -58,6 +64,11 @@ public class MainInfoController { private AdminUserApi adminUserApi; @Resource private BpmTaskApi bpmTaskApi; + @Resource + private PermissionCommonApi permissionApi; + + protected static final String CONTEXT_KEY = DeptDataPermissionRule.class.getSimpleName(); + @PostMapping("/create") @Operation(summary = "创建工单信息") @@ -140,6 +151,13 @@ public class MainInfoController { public CommonResult> getMainInfoPage(@Valid MainInfoPageReqVO pageReqVO) { //登录人所属业务线 pageReqVO.setBusiLine(getBusiLine()); + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + if (loginUser == null) { + return null; + } + //获取登录人权限 + DeptDataPermissionRespDTO deptDataPermission = permissionApi.getDeptDataPermission(loginUser.getId()); + pageReqVO.setDeptIds(deptDataPermission.getDeptIds()); PageResult pageResult = mainInfoService.getMainInfoPage(pageReqVO); if (pageResult == null) { diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoPageReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoPageReqVO.java index 4ef8713..6db260e 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoPageReqVO.java +++ b/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 { @Schema(description = "工单来源编码") private String woSourceId; + @Schema(description = "部门id") + private Set deptIds; -} \ No newline at end of file +} diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java index 01d8973..8e81494 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java +++ b/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 { .likeIfPresent(MainInfoDO::getRemark, reqVO.getRemark()) .likeIfPresent(MainInfoDO::getHandleResult, reqVO.getHandleResult()) .betweenIfPresent(MainInfoDO::getCreateTime, reqVO.getCreateTime()) + .inIfPresent(MainInfoDO::getDeptId, reqVO.getDeptIds()) .orderByDesc(MainInfoDO::getId); return selectPage(reqVO, queryWrapper); }