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 bd084c0d..096d064c 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 @@ -174,6 +174,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl() .eq(LawsOverseasStandard::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER))); if (documentCount > 0 || overseasCount > 0){ - throw new JeroBootException("标准编号不可重复入库!"); + throw new JeroBootException("标准编号已入库或已发起入库流程,不可重复发起!"); } - /** - * List list = list( - * new LambdaQueryWrapper() - * .ne(ProcessFbEntryChange::getId, businessId) - * .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)) - * .eq(ProcessFbEntryChange::getOperateType, "1")); - * for (ProcessFbEntryChange processFbEntryChange : list) { - * int count = processDraftService.count( - * new LambdaQueryWrapper() - * .eq(ProcessDraft::getProjectId, processFbEntryChange.getId()) - * .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - * .or().isNull(ProcessDraft::getSaveSource))); - * if (count == 0){ - * throw new JeroBootException("标准编号已入库或已发起入库流程,不可重复发起!"); - * } - * } - */ + List list = list( + new LambdaQueryWrapper() + .ne(ProcessFbEntryChange::getId, businessId) + .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)) + .eq(ProcessFbEntryChange::getOperateType, "1")); + for (ProcessFbEntryChange processFbEntryChange : list) { + int count = processDraftService.count( + new LambdaQueryWrapper() + .eq(ProcessDraft::getProjectId, processFbEntryChange.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + .or().isNull(ProcessDraft::getSaveSource))); + if (count == 0){ + throw new JeroBootException("标准编号已入库或已发起入库流程,不可重复发起!"); + } + } } } @@ -267,7 +267,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl