Commit d34dd35eabfbd541393d84983433ad207dfa4738
1 parent
073ffb5c
fix:【bpm】流程操作时,增加数据权限的忽略
Showing
1 changed file
with
10 additions
and
0 deletions
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
| @@ -544,6 +544,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -544,6 +544,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 544 | 544 | ||
| 545 | @Override | 545 | @Override |
| 546 | @Transactional(rollbackFor = Exception.class) | 546 | @Transactional(rollbackFor = Exception.class) |
| 547 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 547 | public void approveTask(Long userId, @Valid BpmTaskApproveReqVO reqVO) { | 548 | public void approveTask(Long userId, @Valid BpmTaskApproveReqVO reqVO) { |
| 548 | // 1.1 校验任务存在 | 549 | // 1.1 校验任务存在 |
| 549 | Task task = validateTask(userId, reqVO.getId()); | 550 | Task task = validateTask(userId, reqVO.getId()); |
| @@ -788,6 +789,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -788,6 +789,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 788 | 789 | ||
| 789 | @Override | 790 | @Override |
| 790 | @Transactional(rollbackFor = Exception.class) | 791 | @Transactional(rollbackFor = Exception.class) |
| 792 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 791 | public void rejectTask(Long userId, @Valid BpmTaskRejectReqVO reqVO) { | 793 | public void rejectTask(Long userId, @Valid BpmTaskRejectReqVO reqVO) { |
| 792 | // 1.1 校验任务存在 | 794 | // 1.1 校验任务存在 |
| 793 | Task task = validateTask(userId, reqVO.getId()); | 795 | Task task = validateTask(userId, reqVO.getId()); |
| @@ -855,6 +857,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -855,6 +857,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 855 | 857 | ||
| 856 | @Override | 858 | @Override |
| 857 | @Transactional(rollbackFor = Exception.class) | 859 | @Transactional(rollbackFor = Exception.class) |
| 860 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 858 | public void returnTask(Long userId, BpmTaskReturnReqVO reqVO) { | 861 | public void returnTask(Long userId, BpmTaskReturnReqVO reqVO) { |
| 859 | // 1.1 当前任务 task | 862 | // 1.1 当前任务 task |
| 860 | Task task = validateTask(userId, reqVO.getId()); | 863 | Task task = validateTask(userId, reqVO.getId()); |
| @@ -983,6 +986,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -983,6 +986,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 983 | 986 | ||
| 984 | @Override | 987 | @Override |
| 985 | @Transactional(rollbackFor = Exception.class) | 988 | @Transactional(rollbackFor = Exception.class) |
| 989 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 986 | public void delegateTask(Long userId, BpmTaskDelegateReqVO reqVO) { | 990 | public void delegateTask(Long userId, BpmTaskDelegateReqVO reqVO) { |
| 987 | String taskId = reqVO.getId(); | 991 | String taskId = reqVO.getId(); |
| 988 | // 1.1 校验任务 | 992 | // 1.1 校验任务 |
| @@ -1012,6 +1016,8 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -1012,6 +1016,8 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 1012 | } | 1016 | } |
| 1013 | 1017 | ||
| 1014 | @Override | 1018 | @Override |
| 1019 | + @Transactional(rollbackFor = Exception.class) | ||
| 1020 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 1015 | public void transferTask(Long userId, BpmTaskTransferReqVO reqVO) { | 1021 | public void transferTask(Long userId, BpmTaskTransferReqVO reqVO) { |
| 1016 | String taskId = reqVO.getId(); | 1022 | String taskId = reqVO.getId(); |
| 1017 | // 1.1 校验任务 | 1023 | // 1.1 校验任务 |
| @@ -1042,6 +1048,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -1042,6 +1048,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 1042 | 1048 | ||
| 1043 | @Override | 1049 | @Override |
| 1044 | @Transactional(rollbackFor = Exception.class) | 1050 | @Transactional(rollbackFor = Exception.class) |
| 1051 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 1045 | public void moveTaskToEnd(String processInstanceId, String reason) { | 1052 | public void moveTaskToEnd(String processInstanceId, String reason) { |
| 1046 | List<Task> taskList = getRunningTaskListByProcessInstanceId(processInstanceId, null, null); | 1053 | List<Task> taskList = getRunningTaskListByProcessInstanceId(processInstanceId, null, null); |
| 1047 | if (CollUtil.isEmpty(taskList)) { | 1054 | if (CollUtil.isEmpty(taskList)) { |
| @@ -1080,6 +1087,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -1080,6 +1087,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 1080 | 1087 | ||
| 1081 | @Override | 1088 | @Override |
| 1082 | @Transactional(rollbackFor = Exception.class) | 1089 | @Transactional(rollbackFor = Exception.class) |
| 1090 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 1083 | public void createSignTask(Long userId, BpmTaskSignCreateReqVO reqVO) { | 1091 | public void createSignTask(Long userId, BpmTaskSignCreateReqVO reqVO) { |
| 1084 | // 1. 获取和校验任务 | 1092 | // 1. 获取和校验任务 |
| 1085 | TaskEntityImpl taskEntity = validateTaskCanCreateSign(userId, reqVO); | 1093 | TaskEntityImpl taskEntity = validateTaskCanCreateSign(userId, reqVO); |
| @@ -1196,6 +1204,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -1196,6 +1204,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 1196 | 1204 | ||
| 1197 | @Override | 1205 | @Override |
| 1198 | @Transactional(rollbackFor = Exception.class) | 1206 | @Transactional(rollbackFor = Exception.class) |
| 1207 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 1199 | @SuppressWarnings("DataFlowIssue") | 1208 | @SuppressWarnings("DataFlowIssue") |
| 1200 | public void deleteSignTask(Long userId, BpmTaskSignDeleteReqVO reqVO) { | 1209 | public void deleteSignTask(Long userId, BpmTaskSignDeleteReqVO reqVO) { |
| 1201 | // 1.1 校验 task 可以被减签 | 1210 | // 1.1 校验 task 可以被减签 |
| @@ -1235,6 +1244,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -1235,6 +1244,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 1235 | 1244 | ||
| 1236 | @Override | 1245 | @Override |
| 1237 | @Transactional(rollbackFor = Exception.class) | 1246 | @Transactional(rollbackFor = Exception.class) |
| 1247 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 1238 | public void withdrawTask(Long userId, String taskId) { | 1248 | public void withdrawTask(Long userId, String taskId) { |
| 1239 | // 1.1 查询本人已办任务 | 1249 | // 1.1 查询本人已办任务 |
| 1240 | HistoricTaskInstance taskInstance = historyService.createHistoricTaskInstanceQuery() | 1250 | HistoricTaskInstance taskInstance = historyService.createHistoricTaskInstanceQuery() |