BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 8f16786471495c2743bd6a1dcf9e13822a416c16

Authored by YunaiV
1 parent 86dc3763

【功能修复】Bpm：获取流程列表的时候，过滤租户

Inline Side-by-side
Showing 2 changed files with 40 additions and 40 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
  View file @8f16786
... ... @@ -2,20 +2,16 @@ package cn.iocoder.yudao.module.bpm.convert.task;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.util.StrUtil;
5   -import cn.iocoder.yudao.framework.common.core.KeyValue;
6 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 6 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
8 7 import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
9   -import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
10 8 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
11 9 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
12 10 import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
13   -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormFieldVO;
14 11 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
15 12 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
16 13 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO;
17 14 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceBpmnModelViewRespVO;
18   -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceReportPageRespVO;
19 15 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
20 16 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
21 17 import cn.iocoder.yudao.module.bpm.convert.definition.BpmProcessDefinitionConvert;
... ... @@ -39,7 +35,10 @@ import org.mapstruct.Mapping;
39 35 import org.mapstruct.MappingTarget;
40 36 import org.mapstruct.factory.Mappers;
41 37  
42   -import java.util.*;
  38 +import java.util.HashSet;
  39 +import java.util.List;
  40 +import java.util.Map;
  41 +import java.util.Set;
43 42  
44 43 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
45 44 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
... ... @@ -85,41 +84,41 @@ public interface BpmProcessInstanceConvert {
85 84 return vpPageResult;
86 85 }
87 86  
88   - default BpmProcessInstanceReportPageRespVO buildProcessInstanceReportPage(PageResult<HistoricProcessInstance> pageResult,
89   - Map<Long, AdminUserRespDTO> userMap,
90   - BpmProcessDefinitionInfoDO processDefinitionInfo) {
91   - PageResult<BpmProcessInstanceReportPageRespVO.BpmProcessInstanceReportRespVO> vpPageResult = BeanUtils.toBean(pageResult,
92   - BpmProcessInstanceReportPageRespVO.BpmProcessInstanceReportRespVO.class);
93   - // 表单列表
94   - List<BpmFormFieldVO> formFieldsList = new ArrayList<>();
95   - processDefinitionInfo.getFormFields().forEach(formFieldStr -> {
96   - BpmFormFieldVO formField = JsonUtils.parseObject(formFieldStr, BpmFormFieldVO.class);
97   - if (formField != null) {
98   - formFieldsList.add(formField);
99   - }
100   - });
101   - for (int i = 0; i < pageResult.getList().size(); i++) {
102   - HistoricProcessInstance historicProcessInstance = pageResult.getList().get(i);
103   - BpmProcessInstanceReportPageRespVO.BpmProcessInstanceReportRespVO respVO = vpPageResult.getList().get(i);
104   - respVO.setStatus(FlowableUtils.getProcessInstanceStatus(historicProcessInstance));
105   - // user
106   - if (userMap != null) {
107   - AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(historicProcessInstance.getStartUserId()));
108   - if (startUser != null) {
109   - respVO.setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
110   - }
111   - }
112   - // 表单数据
113   - List<KeyValue<String, Object>> variables = new ArrayList<>();
114   - formFieldsList.forEach(formField -> {
115   - variables.add(new KeyValue<String, Object>()
116   - .setKey(formField.getField())
117   - .setValue(historicProcessInstance.getProcessVariables().getOrDefault(formField.getField(), "")));
118   - });
119   - respVO.setVariables(variables);
120   - }
121   - return new BpmProcessInstanceReportPageRespVO().setPageResult(vpPageResult).setFormFields(formFieldsList);
122   - }
  87 +// default BpmProcessInstanceReportPageRespVO buildProcessInstanceReportPage(PageResult<HistoricProcessInstance> pageResult,
  88 +// Map<Long, AdminUserRespDTO> userMap,
  89 +// BpmProcessDefinitionInfoDO processDefinitionInfo) {
  90 +// PageResult<BpmProcessInstanceReportPageRespVO.BpmProcessInstanceReportRespVO> vpPageResult = BeanUtils.toBean(pageResult,
  91 +// BpmProcessInstanceReportPageRespVO.BpmProcessInstanceReportRespVO.class);
  92 +// // 表单列表
  93 +// List<BpmFormFieldVO> formFieldsList = new ArrayList<>();
  94 +// processDefinitionInfo.getFormFields().forEach(formFieldStr -> {
  95 +// BpmFormFieldVO formField = JsonUtils.parseObject(formFieldStr, BpmFormFieldVO.class);
  96 +// if (formField != null) {
  97 +// formFieldsList.add(formField);
  98 +// }
  99 +// });
  100 +// for (int i = 0; i < pageResult.getList().size(); i++) {
  101 +// HistoricProcessInstance historicProcessInstance = pageResult.getList().get(i);
  102 +// BpmProcessInstanceReportPageRespVO.BpmProcessInstanceReportRespVO respVO = vpPageResult.getList().get(i);
  103 +// respVO.setStatus(FlowableUtils.getProcessInstanceStatus(historicProcessInstance));
  104 +// // user
  105 +// if (userMap != null) {
  106 +// AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(historicProcessInstance.getStartUserId()));
  107 +// if (startUser != null) {
  108 +// respVO.setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
  109 +// }
  110 +// }
  111 +// // 表单数据
  112 +// List<KeyValue<String, Object>> variables = new ArrayList<>();
  113 +// formFieldsList.forEach(formField -> {
  114 +// variables.add(new KeyValue<String, Object>()
  115 +// .setKey(formField.getField())
  116 +// .setValue(historicProcessInstance.getProcessVariables().getOrDefault(formField.getField(), "")));
  117 +// });
  118 +// respVO.setVariables(variables);
  119 +// }
  120 +// return new BpmProcessInstanceReportPageRespVO().setPageResult(vpPageResult).setFormFields(formFieldsList);
  121 +// }
123 122  
124 123 default BpmProcessInstanceRespVO buildProcessInstance(HistoricProcessInstance processInstance,
125 124 ProcessDefinition processDefinition,
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
  View file @8f16786
... ... @@ -86,6 +86,7 @@ public class BpmModelServiceImpl implements BpmModelService {
86 86 if (StrUtil.isNotEmpty(name)) {
87 87 modelQuery.modelNameLike("%" + name + "%");
88 88 }
  89 + modelQuery.modelTenantId(FlowableUtils.getTenantId());
89 90 return modelQuery.list();
90 91 }
91 92  
... ...