diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 9fa0ea3d..b02cbaf2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -392,6 +392,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl() .in(ProcessAll::getProjectId, idList) .eq(ProcessAll::getPrcStatus, "1")); - if (count > 0) { + int size = processDraftService.count(new LambdaQueryWrapper() + .in(ProcessDraft::getProjectId, idList) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + .or().isNull(ProcessDraft::getSaveSource))); + if (count > 0 || size > 0) { throw new JeroBootException("标准编号在标准法规变更流程进行中,不可删除!"); } }