[fix]

流程模型删除错误问题无流程模型查询报错问题

[fix]
流程模型删除错误问题无流程模型查询报错问题
cks
1 parent d60be0bb
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
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
 package cn.iocoder.yudao.module.bpm.dal.mysql.definition;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,7 +12,8 @@ import java.util.List;
 public interface BpmProcessDefinitionExtMapper extends BaseMapperX<BpmProcessDefinitionExtDO> {
     default List<BpmProcessDefinitionExtDO> selectListByProcessDefinitionIds(Collection<String> processDefinitionIds) {
-        return selectList("process_definition_id", processDefinitionIds);
+        return selectList(new LambdaQueryWrapperX<BpmProcessDefinitionExtDO>()
+                .inIfPresent(BpmProcessDefinitionExtDO::getProcessDefinitionId,processDefinitionIds));
     }
     default BpmProcessDefinitionExtDO selectByProcessDefinitionId(String processDefinitionId) {
@@ -215,6 +215,9 @@ public class BpmModelServiceImpl  implements BpmModelService {
         if (oldDefinition == null) {
             return;
         }
+        if(oldDefinition.isSuspended()){
+            return;
+        }
         processDefinitionService.updateProcessDefinitionState(oldDefinition.getId(), SuspensionState.SUSPENDED.getStateCode());
     }