From 3cc3681cdec6b6b7683b114706247a54fefbf7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Fri, 12 Sep 2025 13:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/system/domain/KyDataClassify.java | 6 +++---
 .../java/com/bonus/system/domain/vo/KyDataClassifyVo.java | 2 +-
 .../system/service/impl/KyDataClassifyServiceImpl.java    | 2 +-
 .../main/resources/mapper/system/KyDataClassifyMapper.xml | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bonus-system/src/main/java/com/bonus/system/domain/KyDataClassify.java b/bonus-system/src/main/java/com/bonus/system/domain/KyDataClassify.java
index afcdbea..04489bc 100644
--- a/bonus-system/src/main/java/com/bonus/system/domain/KyDataClassify.java
+++ b/bonus-system/src/main/java/com/bonus/system/domain/KyDataClassify.java
@@ -21,7 +21,7 @@ public class KyDataClassify {
     /**
      * 父id
      */
-    private Long pid;
+    private String pid;
 
     /**
      * 父名称
@@ -161,11 +161,11 @@ public class KyDataClassify {
         this.delFlag = delFlag;
     }
 
-    public Long getPid() {
+    public String getPid() {
         return pid;
     }
 
-    public void setPid(Long pid) {
+    public void setPid(String pid) {
         this.pid = pid;
     }
 
diff --git a/bonus-system/src/main/java/com/bonus/system/domain/vo/KyDataClassifyVo.java b/bonus-system/src/main/java/com/bonus/system/domain/vo/KyDataClassifyVo.java
index 2bd401c..7ec6092 100644
--- a/bonus-system/src/main/java/com/bonus/system/domain/vo/KyDataClassifyVo.java
+++ b/bonus-system/src/main/java/com/bonus/system/domain/vo/KyDataClassifyVo.java
@@ -15,7 +15,7 @@ public class KyDataClassifyVo {
     /**
      * id
      */
-    private Long id;
+    private String code;
 
     /**
      * 名称
diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java
index 0610390..a802798 100644
--- a/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java
+++ b/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java
@@ -87,7 +87,7 @@ public class KyDataClassifyServiceImpl implements KyDataClassifyService {
         if (KyDataClassifyVoList.size()>0){
             //获取子级
             for (KyDataClassifyVo kyDataClassifyVo:KyDataClassifyVoList) {
-                kyDataClassify.setPid(kyDataClassifyVo.getId());
+                kyDataClassify.setPid(kyDataClassifyVo.getCode());
                 List<KyDataClassify> kyDataClassifyList = kyDataClassifyMapper.listAll(kyDataClassify);
                 kyDataClassifyVo.setKyDataClassifyList(kyDataClassifyList);
             }
diff --git a/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml b/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml
index 9631950..bcffa3b 100644
--- a/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml
+++ b/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml
@@ -36,9 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectKyDataClassifyList" resultType="com.bonus.system.domain.KyDataClassify">
         select dkdc.id as id ,dkdc.data_type_name as dataTypeName,dkdc.remark as remark,
         dkdc.update_time as updateTime, dkdc.update_user_id as createUserId,
-        dkdc.update_user_name as updateUserName,dksdd.dict_label as pName,dksdd.dict_code as dict_code
+        dkdc.update_user_name as updateUserName,dksdd.dict_label as pName,dksdd.dict_code as pid
         from da_ky_data_classify dkdc
-        left join da_ky_sys_dict_data dksdd on dkdc.pid =dksdd.dict_code
+        left join da_ky_sys_dict_data dksdd on dkdc.pid =dksdd.dict_value
         where del_flag='1'
         <if test="dataTypeName!=null">
             and data_type_name  LIKE CONCAT('%', #{dataTypeName}, '%')
@@ -51,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="dataTypeName!=null">
             and data_type_name  LIKE CONCAT('%', #{dataTypeName}, '%')
         </if>
-        <if test="dataTypeName!=null">
-            and data_type_name  LIKE CONCAT('%', #{dataTypeName}, '%')
+        <if test="pid!=null">
+            and pid  =#{pid}
         </if>
     </select>
     <select id="selectKyDataClassifyByDataTypeName" resultType="com.bonus.system.domain.KyDataClassify">