ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 任务管理模块，get方法不需要数据权限

Browse Source 
新增 查询流程已经审批过的人员信息
修改 支付管理暂时关闭数据权限
This commit is contained in:
furongxin 2024-08-30 09:28:08 +08:00
parent b1f1aace4a
commit ff4092e5b2
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAWorkTaskController.java
View File

@ -59,6 +59,7 @@ public class BpmOAWorkTaskController {
@GetMapping("/get")
@Operation(summary = "获得任务分配")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@DataPermission(enable = false)
public CommonResult<BpmOAWorkTaskRespVO> getTask(@RequestParam("id") Long id) {
BpmOAWorkTaskDO workTask = workTaskService.getWorkTask(id);

32
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
View File

@ -1,23 +1,31 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.flowable.task.api.Task;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 流程任务实例")
@ -30,6 +38,9 @@ public class BpmTaskController {
@Resource
private BpmTaskService taskService;
@Resource
private AdminUserApi userApi;
/**
* add by yaojun 2024.1.3
* 流程审核添加了抄送用户（多用户）的功能
@ -148,4 +159,25 @@ public class BpmTaskController {
return success(taskService.getCurrentTaskIdByProcessInstanceId(processInstanceId));
}
@GetMapping("getAssigneeUserId")
@Operation(summary = "根据流程实例ID，获取审批人信息")
@Parameter(name = "processInstanceId", description = "流程实例 ID", required = true)
@DataPermission(enable = false)
public CommonResult<List<AdminUserRespDTO>> getAssigneeUserIdByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) {
List<AdminUserRespDTO> userRespDTO = new ArrayList<>();
List<Task> tasks = taskService.getTasksByProcessInstanceId(processInstanceId);
// 获取用户信息
List<String> userIds = convertList(tasks, Task::getAssignee);
if (CollUtil.isEmpty(userIds)) {
return success(userRespDTO);
}
userRespDTO = userApi.getUserList(userIds.stream().map(Long::parseLong).collect(Collectors.toList())).getCheckedData();
userRespDTO = userRespDTO.stream().filter(user -> user.getStatus().equals(CommonStatusEnum.ENABLE.getStatus())).collect(Collectors.toList());
return success(userRespDTO);
}
}

5
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/datapermission/config/DataPermissionConfiguration.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.bpm.framework.datapermission.config;
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAWorkTaskDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
import org.springframework.context.annotation.Bean;
@ -21,11 +20,11 @@ public class DataPermissionConfiguration {
// user
rule.addUserColumn(BpmProcessInstanceExtDO.class, "start_user_id");
rule.addUserColumn(BpmOAWorkTaskDO.class, "from_user_id");
rule.addUserColumn(FinancialPaymentDO.class, "user_id");
// rule.addUserColumn(FinancialPaymentDO.class, "user_id");
//dept
rule.addDeptColumn(BpmOAWorkTaskDO.class, "from_dept_id");
rule.addDeptColumn(FinancialPaymentDO.class, "dept_id");
// rule.addDeptColumn(FinancialPaymentDO.class, "dept_id");
};
}