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<LawsEnterpris
         LambdaQueryWrapper<LawsEnterpriseStandard> 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<LawsEnterpriseStandard> esList = this.list(lambdaQueryWrapper);