From 170fe1aa7a0bd7f21e75eb83987335615ac26ff4 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 7 Aug 2024 20:06:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(88091):=20=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/standard/util/StandardUtil.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java index 0414dad2..7ba3b040 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java @@ -8,6 +8,8 @@ import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService; import com.jero.modules.activiti.service.ProcessAllService; +import com.jero.modules.compare.entity.SarFileCompareInfo; +import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.service.DoNotSplitStandardProvider; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; @@ -34,6 +36,9 @@ public class StandardUtil { @Resource private ILawsDomesticStandardService lawsDomesticStandardService; + @Resource + private ISarFileCompareInfoService sarFileCompareInfoService; + @Resource private ProcessStandardInterpretService processStandardInterpretService; @@ -94,11 +99,21 @@ public class StandardUtil { .collect(Collectors.toList()); int count = sarFileSplitInfoService.count( new LambdaQueryWrapper() - .in(SarFileSplitInfoEO::getStandardId, needDelStandardIdList) - .or().in(SarFileSplitInfoEO::getSerialNumber, standardNumberList)); + .isNull(SarFileSplitInfoEO::getPublishBeforeId) + .and(w -> w.in(SarFileSplitInfoEO::getStandardId, needDelStandardIdList) + .or().in(SarFileSplitInfoEO::getSerialNumber, standardNumberList))); if (count > 0) { throw new JeroBootException(ResultCommon.SCC_DELETE_STANDARD_ERROR2); } + + // 查询对比数据 + int count2 = sarFileCompareInfoService.count( + new LambdaQueryWrapper() + .in(SarFileCompareInfo::getSerialNumberLeft, standardNumberList) + .or().in(SarFileCompareInfo::getSerialNumberRight, standardNumberList)); + if (count2 > 0) { + throw new JeroBootException(ResultCommon.SCC_DELETE_STANDARD_ERROR4); + } } }