Commit 00269fd911251698f86af86caa37bcf546ba1c4d
1 parent
efe42001
修复已办任务，审批结果展示不正确的问题
Showing
5 changed files
with
4 additions
and
5 deletions
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java
yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java
| ... | ... | @@ -5,7 +5,6 @@ import cn.hutool.core.util.RandomUtil; |
| 5 | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | 6 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 7 | 7 | import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; |
| 8 | -import cn.iocoder.yudao.framework.datapermission.core.dept.rule.DeptDataPermissionRule; | |
| 9 | 8 | import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; |
| 10 | 9 | import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; |
| 11 | 10 | import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; |
| ... | ... | @@ -69,11 +68,13 @@ public class BpmUserTaskActivityBehavior extends UserTaskActivityBehavior { |
| 69 | 68 | public BpmUserTaskActivityBehavior(UserTask userTask) { |
| 70 | 69 | super(userTask); |
| 71 | 70 | } |
| 71 | + | |
| 72 | 72 | public void setScripts(List<BpmTaskAssignScript> scripts) { |
| 73 | 73 | this.scriptMap = convertMap(scripts, script -> script.getEnum().getId()); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | @Override |
| 77 | + @DataPermission(enable = false) // 不需要处理数据权限， 不然会有问题，查询不到数据 | |
| 77 | 78 | protected void handleAssignments(TaskService taskService, String assignee, String owner, List<String> candidateUsers, List<String> candidateGroups, TaskEntity task, ExpressionManager expressionManager, DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration) { |
| 78 | 79 | // 第一步，获得任务的规则 |
| 79 | 80 | BpmTaskAssignRuleDO rule = getTaskRule(task); |
| ... | ... | @@ -98,7 +99,6 @@ public class BpmUserTaskActivityBehavior extends UserTaskActivityBehavior { |
| 98 | 99 | return taskRules.get(0); |
| 99 | 100 | } |
| 100 | 101 | |
| 101 | - @VisibleForTesting | |
| 102 | 102 | Set<Long> calculateTaskCandidateUsers(TaskEntity task, BpmTaskAssignRuleDO rule) { |
| 103 | 103 | Set<Long> assigneeUserIds = null; |
| 104 | 104 | if (Objects.equals(BpmTaskAssignRuleTypeEnum.ROLE.getType(), rule.getType())) { | ... | ... |
yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java
| ... | ... | @@ -15,7 +15,6 @@ import java.util.Set; |
| 15 | 15 | @Component |
| 16 | 16 | public class BpmTaskAssignLeaderX2Script extends BpmTaskAssignLeaderAbstractScript { |
| 17 | 17 | |
| 18 | - | |
| 19 | 18 | @Override |
| 20 | 19 | @DataPermission(enable = false) // 不需要处理数据权限， 不然会有问题，查询不到数据 |
| 21 | 20 | public Set<Long> calculateTaskCandidateUsers(TaskEntity task) { | ... | ... |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
yudao-ui-admin/src/views/bpm/task/done.vue
| ... | ... | @@ -25,7 +25,7 @@ |
| 25 | 25 | <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" width="120" /> |
| 26 | 26 | <el-table-column label="结果" align="center" prop="result"> |
| 27 | 27 | <template slot-scope="scope"> |
| 28 | - <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.result"/> | |
| 28 | + <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/> | |
| 29 | 29 | </template> |
| 30 | 30 | </el-table-column> |
| 31 | 31 | <el-table-column label="审批意见" align="center" prop="comment" width="200" /> | ... | ... |