From 5f9ba2eed87fea138e898daa613c607f5f68511f Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Fri, 27 Jun 2025 15:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplier/base/constant/CoscoCategoryConstant.java  | 10 ++++++++++
 .../service/impl/CoscoCategoryServiceImpl.java         |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
index 52dd4bd..5ed57cc 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
@@ -53,4 +53,14 @@ public interface CoscoCategoryConstant {
      * 最高级 0
      */
     public static final String LEVEL_TOP = "0";
+
+        /**
+     *      * 类型(0.分类、1.品类)
+     *      */
+        public static final Long CATEGORY_TYPE_CATEGORY = 0L;
+        /**
+     *      * 类型(0.分类、1.品类)
+     *      */
+        public static final Long CATEGORY_TYPE_CATEGORY_TYPE = 1L;
+
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java
index 92e85d6..f5d40fc 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java
@@ -67,7 +67,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
         coscoCategory.setId(PropertyUtils.getSnowflakeId());
         if (!coscoCategory.getParentId().equals(CoscoCategoryConstant.LEVEL_TOP)) {
             CoscoCategory coscoCategory1 = coscoCategoryMapper.selectCoscoCategoryById(coscoCategory.getParentId());
-            if (coscoCategory1.getType().equals(1L)) {
+            if (coscoCategory1.getType().equals(CoscoCategoryConstant.CATEGORY_TYPE_CATEGORY_TYPE)) {
                 throw new RuntimeException(ErrorMessageConstant.ENABLE_DISABLE_TEMPLATE_NOT_MODIFY);
             }
             coscoCategory.setAncestors(coscoCategory1.getAncestors() + "," + coscoCategory.getId());
@@ -87,7 +87,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
     @Override
     public int updateCoscoCategory(CoscoCategory coscoCategory) {
         coscoCategory.setUpdateTime(new Date());
-        coscoCategory.setUpdateBy("1");
+        coscoCategory.setUpdateBy(SupplierUserConstant.USER_NAME);
         return coscoCategoryMapper.updateCoscoCategory(coscoCategory);
     }
 
@@ -136,7 +136,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
          * 获取全部上级部门id
          */
         List<String> deptIds = new ArrayList<>();
-        deptIds.add("dep01");
+        deptIds.add(SupplierUserConstant.DEPT_ID);
         coscoCategory.setDeptIds(deptIds);
         return selectCategoryTree(coscoCategory);
     }
@@ -154,7 +154,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
     private List<CoscoCategoryVO> buildTree(List<CoscoCategoryVO> categories) {
         // 获取所有顶级节点 (parentId = "0")
         List<CoscoCategoryVO> rootNodes = categories.stream()
-                .filter(c -> "0".equals(c.getParentId()))
+                .filter(c -> CoscoCategoryConstant.LEVEL_TOP.equals(c.getParentId()))
                 .map(this::convertToTreeDto)
                 .collect(Collectors.toList());