BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 00d9645673b6937c4cdb12fd00b9b73bcf806eb6

Authored by cks
1 parent d60be0bb

[fix] 

流程模型删除错误问题
无流程模型查询报错问题
Inline Side-by-side
Showing 2 changed files with 6 additions and 1 deletions
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java
  View file @00d9645
1 1 package cn.iocoder.yudao.module.bpm.dal.mysql.definition;
2 2  
  3 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
3 4 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
4 5 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 6 import org.apache.ibatis.annotations.Mapper;
... ... @@ -11,7 +12,8 @@ import java.util.List;
11 12 public interface BpmProcessDefinitionExtMapper extends BaseMapperX<BpmProcessDefinitionExtDO> {
12 13  
13 14 default List<BpmProcessDefinitionExtDO> selectListByProcessDefinitionIds(Collection<String> processDefinitionIds) {
14   - return selectList("process_definition_id", processDefinitionIds);
  15 + return selectList(new LambdaQueryWrapperX<BpmProcessDefinitionExtDO>()
  16 + .inIfPresent(BpmProcessDefinitionExtDO::getProcessDefinitionId,processDefinitionIds));
15 17 }
16 18  
17 19 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 @00d9645
... ... @@ -215,6 +215,9 @@ public class BpmModelServiceImpl implements BpmModelService {
215 215 if (oldDefinition == null) {
216 216 return;
217 217 }
  218 + if(oldDefinition.isSuspended()){
  219 + return;
  220 + }
218 221 processDefinitionService.updateProcessDefinitionState(oldDefinition.getId(), SuspensionState.SUSPENDED.getStateCode());
219 222 }
220 223  
... ...