From 8a257df3b19c31a424968befe82be08e7734bda0 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Thu, 24 Jul 2025 11:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CoscoSupplierBaseServiceImpl.java           | 5 +++++
 .../zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java  | 5 +++++
 .../dao/mapper/CoscoCategoryLibraryContainMapper.xml         | 3 +--
 .../supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml     | 3 +--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
index 5c22f8e..5f505cc 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
@@ -511,6 +511,11 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
                     vo.setDeptName(orgInfo.getOrgName());
                 }
             }
+            if(vo.getCategoryIds()!=null && vo.getCategoryIds().length()>0){
+                String[] split = vo.getCategoryIds().split(",");
+                List<String> categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split)));
+                vo.setCategoryName(String.join(",", categoryNameListByIds));
+            }
         });
         return supplierPage;
     }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java
index 5c7f33d..77c44fa 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java
@@ -85,6 +85,11 @@ public class    SupplierPageVo {
      * 黑名单部门list
      */
     private List<String> blackListDept;
+
+    /**
+     * 企业类型
+     */
+    private String enterpriseType;
     /**
      * 查询部门list
      */
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml
index c4bdadc..569969b 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml
@@ -108,8 +108,7 @@
     <select id="selectCoscoCateGoryIdByLibraryId" parameterType="string" resultType="string">
         select cclc.category_id
         from cosco_category_library_contain cclc
-        join cosco_category cc on cc.id= cclc.category_id
-                                where cclc.category_library_id = #{libraryId} and cc.type=1
+                                where cclc.category_library_id = #{libraryId}
     </select>
 
     <select id="selectSupplierIdByLibraryId" parameterType="string" resultType="string">
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
index d9e1bfd..04cfe1b 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
@@ -965,12 +965,11 @@
 
     <select id="getSupplierPage" parameterType="map"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo">
-
-
         select
         csb.id,
         csb.name,
         csb.name_en as nameEn,
+        csb.enterprise_type as enterpriseType,
         csb.supplier_type AS supplierType,
         CASE
         WHEN csb.supplier_type = 'dvs' THEN social_credit_code