修复已办任务,审批结果展示不正确的问题

This commit is contained in:
YunaiV 2022-03-20 01:21:09 +08:00
parent efe4200181
commit 00269fd911
5 changed files with 4 additions and 5 deletions

View File

@ -22,7 +22,6 @@ public interface BpmMessageService {
*/ */
void sendMessageWhenProcessInstanceApprove(@Valid BpmMessageSendWhenProcessInstanceApproveReqDTO reqDTO); void sendMessageWhenProcessInstanceApprove(@Valid BpmMessageSendWhenProcessInstanceApproveReqDTO reqDTO);
/** /**
* 发送流程实例被不通过的消息 * 发送流程实例被不通过的消息
* *

View File

@ -5,7 +5,6 @@ import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
import cn.iocoder.yudao.framework.datapermission.core.dept.rule.DeptDataPermissionRule;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum;
@ -69,11 +68,13 @@ public class BpmUserTaskActivityBehavior extends UserTaskActivityBehavior {
public BpmUserTaskActivityBehavior(UserTask userTask) { public BpmUserTaskActivityBehavior(UserTask userTask) {
super(userTask); super(userTask);
} }
public void setScripts(List<BpmTaskAssignScript> scripts) { public void setScripts(List<BpmTaskAssignScript> scripts) {
this.scriptMap = convertMap(scripts, script -> script.getEnum().getId()); this.scriptMap = convertMap(scripts, script -> script.getEnum().getId());
} }
@Override @Override
@DataPermission(enable = false) // 不需要处理数据权限 不然会有问题查询不到数据
protected void handleAssignments(TaskService taskService, String assignee, String owner, List<String> candidateUsers, List<String> candidateGroups, TaskEntity task, ExpressionManager expressionManager, DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration) { protected void handleAssignments(TaskService taskService, String assignee, String owner, List<String> candidateUsers, List<String> candidateGroups, TaskEntity task, ExpressionManager expressionManager, DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration) {
// 第一步获得任务的规则 // 第一步获得任务的规则
BpmTaskAssignRuleDO rule = getTaskRule(task); BpmTaskAssignRuleDO rule = getTaskRule(task);
@ -98,7 +99,6 @@ public class BpmUserTaskActivityBehavior extends UserTaskActivityBehavior {
return taskRules.get(0); return taskRules.get(0);
} }
@VisibleForTesting
Set<Long> calculateTaskCandidateUsers(TaskEntity task, BpmTaskAssignRuleDO rule) { Set<Long> calculateTaskCandidateUsers(TaskEntity task, BpmTaskAssignRuleDO rule) {
Set<Long> assigneeUserIds = null; Set<Long> assigneeUserIds = null;
if (Objects.equals(BpmTaskAssignRuleTypeEnum.ROLE.getType(), rule.getType())) { if (Objects.equals(BpmTaskAssignRuleTypeEnum.ROLE.getType(), rule.getType())) {

View File

@ -15,7 +15,6 @@ import java.util.Set;
@Component @Component
public class BpmTaskAssignLeaderX2Script extends BpmTaskAssignLeaderAbstractScript { public class BpmTaskAssignLeaderX2Script extends BpmTaskAssignLeaderAbstractScript {
@Override @Override
@DataPermission(enable = false) // 不需要处理数据权限 不然会有问题查询不到数据 @DataPermission(enable = false) // 不需要处理数据权限 不然会有问题查询不到数据
public Set<Long> calculateTaskCandidateUsers(TaskEntity task) { public Set<Long> calculateTaskCandidateUsers(TaskEntity task) {

View File

@ -63,6 +63,7 @@ public class AdminUserServiceImpl implements AdminUserService {
private FileApi fileApi; private FileApi fileApi;
@Override @Override
public Long createUser(UserCreateReqVO reqVO) { public Long createUser(UserCreateReqVO reqVO) {
// 校验账户配合 // 校验账户配合
tenantService.handleTenantInfo(tenant -> { tenantService.handleTenantInfo(tenant -> {

View File

@ -25,7 +25,7 @@
<el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" width="120" /> <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" width="120" />
<el-table-column label="结果" align="center" prop="result"> <el-table-column label="结果" align="center" prop="result">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.result"/> <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批意见" align="center" prop="comment" width="200" /> <el-table-column label="审批意见" align="center" prop="comment" width="200" />