Commit fe186da113591f87aa3c580538f5311ff816edf9
1 parent
d34dd35e
fix:【bpm】流程操作时,增加数据权限的忽略
Showing
1 changed file
with
5 additions
and
0 deletions
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
| @@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.common.util.date.DateUtils; | @@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.common.util.date.DateUtils; | ||
| 12 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; | 12 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; |
| 13 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | 13 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; |
| 14 | import cn.iocoder.yudao.framework.common.util.object.PageUtils; | 14 | import cn.iocoder.yudao.framework.common.util.object.PageUtils; |
| 15 | +import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; | ||
| 15 | import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; | 16 | import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; |
| 16 | import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO; | 17 | import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO; |
| 17 | import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; | 18 | import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; |
| @@ -752,6 +753,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | @@ -752,6 +753,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | ||
| 752 | 753 | ||
| 753 | @Override | 754 | @Override |
| 754 | @Transactional(rollbackFor = Exception.class) | 755 | @Transactional(rollbackFor = Exception.class) |
| 756 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 755 | public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO) { | 757 | public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO) { |
| 756 | // 获得流程定义 | 758 | // 获得流程定义 |
| 757 | ProcessDefinition definition = processDefinitionService | 759 | ProcessDefinition definition = processDefinitionService |
| @@ -762,6 +764,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | @@ -762,6 +764,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | ||
| 762 | } | 764 | } |
| 763 | 765 | ||
| 764 | @Override | 766 | @Override |
| 767 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 765 | public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO createReqDTO) { | 768 | public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO createReqDTO) { |
| 766 | return FlowableUtils.executeAuthenticatedUserId(userId, () -> { | 769 | return FlowableUtils.executeAuthenticatedUserId(userId, () -> { |
| 767 | // 获得流程定义 | 770 | // 获得流程定义 |
| @@ -878,6 +881,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | @@ -878,6 +881,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | ||
| 878 | } | 881 | } |
| 879 | 882 | ||
| 880 | @Override | 883 | @Override |
| 884 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 881 | public void cancelProcessInstanceByStartUser(Long userId, @Valid BpmProcessInstanceCancelReqVO cancelReqVO) { | 885 | public void cancelProcessInstanceByStartUser(Long userId, @Valid BpmProcessInstanceCancelReqVO cancelReqVO) { |
| 882 | // 1.1 校验流程实例存在 | 886 | // 1.1 校验流程实例存在 |
| 883 | ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); | 887 | ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); |
| @@ -907,6 +911,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | @@ -907,6 +911,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | ||
| 907 | } | 911 | } |
| 908 | 912 | ||
| 909 | @Override | 913 | @Override |
| 914 | + @DataPermission(enable = false) // 关闭数据权限,避免查询不到用户数据。相关案例:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID1UYA | ||
| 910 | public void cancelProcessInstanceByAdmin(Long userId, BpmProcessInstanceCancelReqVO cancelReqVO) { | 915 | public void cancelProcessInstanceByAdmin(Long userId, BpmProcessInstanceCancelReqVO cancelReqVO) { |
| 911 | // 1.1 校验流程实例存在 | 916 | // 1.1 校验流程实例存在 |
| 912 | ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); | 917 | ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); |