From 1f3a5cfdfe6e8a757c0a4061fd7fcd31564b885f 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 11:28:40 +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

---
 .../bonus/system/domain/KyDataClassify.java   | 27 +++++++++++++++++++
 .../system/mapper/KyDataClassifyMapper.java   |  1 +
 .../mapper/system/KyDataClassifyMapper.xml    |  8 ++++--
 3 files changed, 34 insertions(+), 2 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 01c6c6b..afcdbea 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
@@ -18,6 +18,17 @@ public class KyDataClassify {
      */
     private Long id;
 
+    /**
+     * 父id
+     */
+    private Long pid;
+
+    /**
+     * 父名称
+     */
+    private String pName;
+
+
     /**
      * 数据类型名称
      */
@@ -150,6 +161,22 @@ public class KyDataClassify {
         this.delFlag = delFlag;
     }
 
+    public Long getPid() {
+        return pid;
+    }
+
+    public void setPid(Long pid) {
+        this.pid = pid;
+    }
+
+    public String getpName() {
+        return pName;
+    }
+
+    public void setpName(String pName) {
+        this.pName = pName;
+    }
+
     @Override
     public String toString() {
         return "KyDataClassify{" +
diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java
index 2221c63..4ab1e60 100644
--- a/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java
+++ b/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java
@@ -47,4 +47,5 @@ public interface KyDataClassifyMapper {
      * @return
      */
     KyDataClassify selectKyDataClassifyByDataTypeName(KyDataClassify kyDataClassify);
+
 }
diff --git a/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml b/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml
index 90eaa04..b72956b 100644
--- a/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml
+++ b/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml
@@ -34,8 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectKyDataClassifyList" resultType="com.bonus.system.domain.KyDataClassify">
-        select id,data_type_name,remark,update_time,update_user_id,update_user_name
-        from da_ky_data_classify where del_flag='1'
+        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
+        from da_ky_data_classify dkdc
+        left join da_ky_sys_dict_data dksdd on dkdc.pid =dksdd.dict_code
+        where del_flag='1'
         <if test="dataTypeName!=null">
             and data_type_name  LIKE CONCAT('%', #{dataTypeName}, '%')
         </if>