BJ_ZTEITS-Developers / parking-cloud-yudao

Commit bdfea0c5da5a3ff91b72c070e44bda790dbd6c76

Authored by cks
1 parent 00d96456

[fix] 

1. 精准匹配，限制条件添加在service中
2. 空格问题
Inline Side-by-side
Showing 4 changed files with 8 additions and 3 deletions
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java
  View file @bdfea0c
@@ -12,8 +12,7 @@ import java.util.List; @@ -12,8 +12,7 @@ import java.util.List;
12 public interface BpmProcessDefinitionExtMapper extends BaseMapperX<BpmProcessDefinitionExtDO> { 12 public interface BpmProcessDefinitionExtMapper extends BaseMapperX<BpmProcessDefinitionExtDO> {
13 13
14 default List<BpmProcessDefinitionExtDO> selectListByProcessDefinitionIds(Collection<String> processDefinitionIds) { 14 default List<BpmProcessDefinitionExtDO> selectListByProcessDefinitionIds(Collection<String> processDefinitionIds) {
15 - return selectList(new LambdaQueryWrapperX<BpmProcessDefinitionExtDO>()  
16 - .inIfPresent(BpmProcessDefinitionExtDO::getProcessDefinitionId,processDefinitionIds)); 15 + return selectList("process_definition_id", processDefinitionIds);
17 } 16 }
18 17
19 default BpmProcessDefinitionExtDO selectByProcessDefinitionId(String processDefinitionId) { 18 default BpmProcessDefinitionExtDO selectByProcessDefinitionId(String processDefinitionId) {
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
  View file @bdfea0c
@@ -215,7 +215,7 @@ public class BpmModelServiceImpl implements BpmModelService { @@ -215,7 +215,7 @@ public class BpmModelServiceImpl implements BpmModelService {
215 if (oldDefinition == null) { 215 if (oldDefinition == null) {
216 return; 216 return;
217 } 217 }
218 - if(oldDefinition.isSuspended()){ 218 + if(oldDefinition.isSuspended()) {
219 return; 219 return;
220 } 220 }
221 processDefinitionService.updateProcessDefinitionState(oldDefinition.getId(), SuspensionState.SUSPENDED.getStateCode()); 221 processDefinitionService.updateProcessDefinitionState(oldDefinition.getId(), SuspensionState.SUSPENDED.getStateCode());
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
  View file @bdfea0c
@@ -103,6 +103,9 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ @@ -103,6 +103,9 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
103 } 103 }
104 // 执行查询 104 // 执行查询
105 List<ProcessDefinition> processDefinitions = definitionQuery.list(); 105 List<ProcessDefinition> processDefinitions = definitionQuery.list();
  106 + if (CollUtil.isEmpty(processDefinitions)) {
  107 + return Collections.emptyList();
  108 + }
106 109
107 // 获得 BpmProcessDefinitionDO Map 110 // 获得 BpmProcessDefinitionDO Map
108 List<BpmProcessDefinitionExtDO> processDefinitionDOs = processDefinitionMapper.selectListByProcessDefinitionIds( 111 List<BpmProcessDefinitionExtDO> processDefinitionDOs = processDefinitionMapper.selectListByProcessDefinitionIds(
yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
  View file @bdfea0c
@@ -236,6 +236,9 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ @@ -236,6 +236,9 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
236 } 236 }
237 // 执行查询 237 // 执行查询
238 List<ProcessDefinition> processDefinitions = definitionQuery.list(); 238 List<ProcessDefinition> processDefinitions = definitionQuery.list();
  239 + if (CollUtil.isEmpty(processDefinitions)) {
  240 + return Collections.emptyList();
  241 + }
239 242
240 // 获得 BpmProcessDefinitionDO Map 243 // 获得 BpmProcessDefinitionDO Map
241 List<BpmProcessDefinitionExtDO> processDefinitionDOs = processDefinitionMapper.selectListByProcessDefinitionIds( 244 List<BpmProcessDefinitionExtDO> processDefinitionDOs = processDefinitionMapper.selectListByProcessDefinitionIds(