diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java index 9d2a561e..a7ac48eb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java @@ -88,6 +88,9 @@ public class EsRevisionServiceImpl extends ServiceImpl processInfoVO) { // 流程Key @@ -264,9 +267,15 @@ public class EsRevisionServiceImpl extends ServiceImpl variables = JSON.parseObject(data.getBusinessJson(), Map.class); String standardNumber = (String) variables.get(FieldCommon.STANDARD_NUMBER); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(LawsEnterpriseStandard::getStandardNumber, variables.get(FieldCommon.STANDARD_NUMBER)); - LawsEnterpriseStandard one = esService.getOne(queryWrapper); - if (Objects.nonNull(one)) { + queryWrapper.eq(LawsEnterpriseStandard::getStandardNumber, standardNumber); + LawsEnterpriseStandard es = esService.getOne(queryWrapper); + if (Objects.nonNull(es)) { + throw new JeroBootException(ResultCommon.STANDARD_NUMBER_ALREADY_EXISTS); + } + LambdaQueryWrapper planQueryWrapper = new LambdaQueryWrapper<>(); + planQueryWrapper.eq(EnterpriseStandardPlan::getStandardNumber, standardNumber); + EnterpriseStandardPlan plan = planService.getOne(planQueryWrapper); + if (Objects.nonNull(plan)) { throw new JeroBootException(ResultCommon.STANDARD_NUMBER_ALREADY_EXISTS); } // 保存数据