From 778d79ac83d81b0d2893a194cebaa2ed4b5a0025 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 7 Aug 2024 19:42:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2088254=20=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86-=E6=96=B0=E5=A2=9E=20=E4=B8=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E7=B1=BB=E4=BB=A3=E7=A0=81=E5=92=8C?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8F=B7=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E4=B8=80=E4=B8=AA=E5=90=8E=E5=86=8D=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=BC=96=E5=8F=B7=E5=B7=B2=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/util/EnterpriseStandardUtil.java | 15 +++++++++++++-- .../impl/LawsEnterpriseStandardServiceImpl.java | 3 ++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java index b95b2fbb..f62fb731 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.enterprise.util; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.enums.YesOrNoEnum; @@ -103,7 +104,12 @@ public class EnterpriseStandardUtil { String categoryCode = this.transCategoryCode(categoryCodeDictValue); // 最后生成的企标编号 - String standardNumber = esCode + "/" + esNameCode + " " + categoryCode + "-" + sequenceNumber + "-" + yearNumber; + String standardNumber = ""; + if (StrUtil.isNotBlank(categoryCode)) { + standardNumber = esCode + "/" + esNameCode + " " + categoryCode + "-" + sequenceNumber + "-" + yearNumber; + } else { + standardNumber = esCode + "/" + esNameCode + " " + sequenceNumber + "-" + yearNumber; + } log.info("生成企标标准号：{}", standardNumber); return standardNumber; } @@ -127,7 +133,12 @@ public class EnterpriseStandardUtil { String categoryCode = this.transCategoryCode(categoryCodeDictValue); // 最后生成的企标编号 - String standardNumber = esCode + "/" + esNameCode + " " + categoryCode + "-" + sequenceNumber + "-" + yearNumber; + String standardNumber = ""; + if (StrUtil.isNotBlank(categoryCode)) { + standardNumber = esCode + "/" + esNameCode + " " + categoryCode + "-" + sequenceNumber + "-" + yearNumber; + } else { + standardNumber = esCode + "/" + esNameCode + " " + sequenceNumber + "-" + yearNumber; + } log.info("组合企标标准号：{}", standardNumber); return standardNumber; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java index ebb19f4c..9f5f95bf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java @@ -82,7 +82,8 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(LawsEnterpriseStandard::getStandardCode, esCodeDictValue); lambdaQueryWrapper.eq(LawsEnterpriseStandard::getNameCode, esNameCodeDictValue); - lambdaQueryWrapper.eq(LawsEnterpriseStandard::getCategoryCode, categoryCodeDictValue); + lambdaQueryWrapper.eq(StrUtil.isNotBlank(categoryCodeDictValue), LawsEnterpriseStandard::getCategoryCode, categoryCodeDictValue); + lambdaQueryWrapper.isNull(StrUtil.isBlank(categoryCodeDictValue) ,LawsEnterpriseStandard::getCategoryCode); List esList = this.list(lambdaQueryWrapper);