From caecf7f09ddfec7d1c0b57b73c3747a0ec6aedf1 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Wed, 25 Jun 2025 14:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=93=81=E7=B1=BB=E5=BA=93?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E9=80=89=E6=8B=A9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CoscoCategoryController.java   |  8 ++++
 ...CoscoCategoryLibraryContainController.java |  1 +
 .../dao/mapper/CoscoCategoryMapper.xml        | 44 +++++++++++++++----
 .../coscoCategory/entity/CoscoCategory.java   |  5 +++
 .../service/ICoscoCategoryService.java        |  7 +++
 .../impl/CoscoCategoryServiceImpl.java        | 11 +++++
 6 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java
index 2692e38..d51be69 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java
@@ -45,6 +45,14 @@ public class CoscoCategoryController extends BaseController {
         return BaseResponse.success(coscoCategoryService.selectCategoryTree(coscoCategory));
     }
 
+    /**
+     * 品类查询去除上级锁定列表
+     */
+    @GetMapping(value = "/categoryTreeNoSuperior")
+    public BaseResponse categoryTreeNoSuperior(CoscoCategory coscoCategory) {
+        return BaseResponse.success(coscoCategoryService.selectCategoryTreeNoSuperior(coscoCategory));
+    }
+
 
 
     /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryContainController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryContainController.java
index b4347ef..2f66422 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryContainController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryContainController.java
@@ -75,4 +75,5 @@ public class CoscoCategoryLibraryContainController extends BaseController {
     public BaseResponse lock(@RequestBody List<CoscoCategoryLibraryContain> coscoCategoryLibraryContain) {
         return BaseResponse.success(coscoCategoryLibraryContainService.updateList(coscoCategoryLibraryContain));
     }
+
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
index 478a0b5..477d7df 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
@@ -40,26 +40,54 @@
     <select id="selectCoscoCategoryList"
             parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory"
             resultMap="CoscoCategoryResult">
-        <include refid="selectCoscoCategoryVo"/>
+        select cc.id,
+        cc.category_name,
+        cc.parent_id,
+        cc.type,
+        cc.order_by,
+        cc.ancestors,
+        cc.remark,
+        cc.del_flag,
+        cc.create_by,
+        cc.create_time,
+        cc.update_by,
+        cc.update_time,
+        cc.last_update_time
+        from cosco_category cc
         <where>
-            and del_flag = 'normal'
+            and cc.del_flag = 'normal'
             <if test="categoryName != null  and categoryName != ''">
-                and category_name like concat('%', #{categoryName}, '%')
+                and cc.category_name like concat('%', #{categoryName}, '%')
             </if>
             <if test="parentId != null  and parentId != ''">
-                and parent_id = #{parentId}
+                and cc.parent_id = #{parentId}
             </if>
             <if test="type != null ">
-                and type = #{type}
+                and cc.type = #{type}
             </if>
             <if test="orderBy != null ">
-                and order_by = #{orderBy}
+                and cc.order_by = #{orderBy}
             </if>
             <if test="ancestors != null  and ancestors != ''">
-                and ancestors = #{ancestors}
+                and cc.ancestors = #{ancestors}
             </if>
             <if test="lastUpdateTime != null ">
-                and last_update_time = #{lastUpdateTime}
+                and cc.last_update_time = #{lastUpdateTime}
+            </if>
+            <if test="deptIds!=null and deptIds.size>0">
+                and cc.id not in (
+                SELECT
+                cclc.category_id
+                FROM
+                cosco_category_library ccl
+                JOIN cosco_category_library_contain cclc on ccl.id=cclc.category_library_id
+                where ccl.dept_id in (
+                <foreach item="deptId" index="index" collection="deptIds" separator=",">
+                    #{deptId}
+                </foreach>
+                ) and ccl.approve_status=1 and cclc.lock_type=1
+                )
+
             </if>
         </where>
     </select>
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java
index 3956a21..f2a593c 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java
@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 品类库_品类对象 cosco_category
@@ -59,5 +60,9 @@ public class CoscoCategory extends CoscoBaseEntity {
     private LocalDateTime lastUpdateTime;
 
     private String remark;
+    /**
+     * 上级部门列表集合
+     */
+    private List<String> deptIds;
 
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java
index 0b493cc..6320092 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java
@@ -76,4 +76,11 @@ public interface ICoscoCategoryService extends IBaseService<CoscoCategory> {
      * @return
      */
     List<CoscoCategoryVO> selectCategoryTree(CoscoCategory coscoCategory);
+
+    /**
+     * 查询品类树(无上级品类)
+     * @param coscoCategory
+     * @return
+     */
+    List<CoscoCategoryVO> selectCategoryTreeNoSuperior(CoscoCategory coscoCategory);
 }
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 73a6a0d..0923e48 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
@@ -130,6 +130,17 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
         return buildTree(cosco);
     }
 
+    @Override
+    public List<CoscoCategoryVO> selectCategoryTreeNoSuperior(CoscoCategory coscoCategory) {
+        /**
+         * 获取全部上级部门id
+         */
+        List<String> deptIds=new ArrayList<>();
+        deptIds.add("dep01");
+        coscoCategory.setDeptIds(deptIds);
+        return selectCategoryTree(coscoCategory);
+    }
+
     private List<CoscoCategoryVO> buildTree(List<CoscoCategoryVO> categories) {
         // 获取所有顶级节点 (parentId = "0")
         List<CoscoCategoryVO> rootNodes = categories.stream()