From 276dd90e562002e5a88d09e0418352330a9dbcc9 Mon Sep 17 00:00:00 2001
From: huangyao <792466870@qq.com>
Date: Wed, 13 Jan 2021 15:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=B1=BB=E5=9E=8B=E6=97=B6=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?update=5Faccount=5Fid=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=8B=BC=E9=9F=B3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9B=20=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E7=BC=96=E7=A0=81=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/mapper/mapping/DictMapper.xml     | 52 ++++++++++---------
 .../modular/mapper/mapping/DictTypeMapper.xml | 20 ++++---
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictMapper.xml b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictMapper.xml
index 2d05de005..5ac0d1150 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictMapper.xml
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictMapper.xml
@@ -3,18 +3,19 @@
 <mapper namespace="cn.stylefeng.roses.kernel.dict.modular.mapper.DictMapper">
 
     <select id="findDetail" resultType="cn.stylefeng.roses.kernel.dict.modular.entity.SysDict" parameterType="long">
-        SELECT dict.dict_id         AS dictId,
-               dict.dict_code       AS dictCode,
-               dict.dict_name       as dictName,
-               dict.dict_encode     as dictEncode,
-               dict.dict_sort       as dictSort,
-               dict.dict_type_code  AS dictTypeCode,
-               dict.dict_short_name AS dictShortName,
-               dict.dict_short_code AS dictShortCode,
-               dict.dict_parent_id  AS dictParentId,
-               dict.status_flag     AS statusFlag,
-               dict.create_time     AS createTime,
-               type.dict_type_name  AS dictTypeName
+        SELECT dict.dict_id          AS dictId,
+               dict.dict_code        AS dictCode,
+               dict.dict_name        as dictName,
+               dict.dict_name_pinyin as dictNamePinyin,
+               dict.dict_encode      as dictEncode,
+               dict.dict_sort        as dictSort,
+               dict.dict_type_code   AS dictTypeCode,
+               dict.dict_short_name  AS dictShortName,
+               dict.dict_short_code  AS dictShortCode,
+               dict.dict_parent_id   AS dictParentId,
+               dict.status_flag      AS statusFlag,
+               dict.create_time      AS createTime,
+               type.dict_type_name   AS dictTypeName
         FROM sys_dict dict
                  INNER JOIN sys_dict_type type ON dict.dict_type_code = type.dict_type_code
         WHERE dict.del_flag = 'N'
@@ -23,18 +24,19 @@
 
     <select id="findList" resultType="cn.stylefeng.roses.kernel.dict.modular.entity.SysDict">
         SELECT type.dict_type_name  as dictTypeName,
-               dict.dict_id         AS dictId,
-               dict.dict_code       AS dictCode,
-               dict.dict_encode     as dictEncode,
-               dict.dict_sort       as dictSort,
-               dict.dict_name       as dictName,
-               dict.dict_type_code  AS dictTypeCode,
-               dict.dict_short_name AS dictShortName,
-               dict.dict_short_code AS dictShortCode,
-               dict.dict_parent_id  AS dictParentId,
-               dict.status_flag     AS statusFlag,
-               dict.create_time     AS createTime,
-               pDict.dict_name      AS parentName
+               dict.dict_id          AS dictId,
+               dict.dict_code        AS dictCode,
+               dict.dict_encode      as dictEncode,
+               dict.dict_sort        as dictSort,
+               dict.dict_name        as dictName,
+               dict.dict_name_pinyin as dictNamePinyin,
+               dict.dict_type_code   AS dictTypeCode,
+               dict.dict_short_name  AS dictShortName,
+               dict.dict_short_code  AS dictShortCode,
+               dict.dict_parent_id   AS dictParentId,
+               dict.status_flag      AS statusFlag,
+               dict.create_time      AS createTime,
+               pDict.dict_name       AS parentName
         FROM sys_dict dict
                  INNER JOIN sys_dict_type type ON dict.dict_type_code = type.dict_type_code
                  LEFT JOIN sys_dict pDict ON pDict.dict_id = dict.dict_parent_id
@@ -78,7 +80,7 @@
             sys_dict
         SET dict_pids         = replace(dict_pids, #{paramCondition.oldParentIds}, #{paramCondition.newParentIds}),
             update_time       = #{paramCondition.updateTime},
-            update_account_id = #{paramCondition.updateUser}
+            update_user = #{paramCondition.updateUser}
         WHERE dict_pids LIKE CONCAT('%', #{paramCondition.oldParentIds}, '%')
     </update>
 
diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictTypeMapper.xml b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictTypeMapper.xml
index 724e5955f..26aa109ea 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictTypeMapper.xml
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictTypeMapper.xml
@@ -19,14 +19,15 @@
 
     <!--查询字典类型列表-->
     <select id="findList" resultType="cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType">
-        SELECT dict_type_id       AS dictTypeId,
-               dict_type_class    AS dictTypeClass,
-               dict_type_bus_code AS dictTypeBusCode,
-               dict_type_code     AS dictTypeCode,
-               dict_type_name     AS dictTypeName,
-               dict_type_desc     AS dictTypeDesc,
-               status_flag        AS statusFlag,
-               dict_type_sort     AS dictTypeSort
+        SELECT dict_type_id          AS dictTypeId,
+               dict_type_class       AS dictTypeClass,
+               dict_type_bus_code    AS dictTypeBusCode,
+               dict_type_name_pinyin AS dictTypeNamePinyin,
+               dict_type_code        AS dictTypeCode,
+               dict_type_name        AS dictTypeName,
+               dict_type_desc        AS dictTypeDesc,
+               status_flag           AS statusFlag,
+               dict_type_sort        AS dictTypeSort
         FROM sys_dict_type
         WHERE del_flag = 'N'
         <if test="dictTypeRequest.dictTypeName != null and dictTypeRequest.dictTypeName !=''">
@@ -37,6 +38,9 @@
             dict_type_name_pinyin like concat('%', #{dictTypeRequest.dictTypeName}, '%')
             )
         </if>
+        <if test="dictTypeRequest.dictTypeClass != null and dictTypeRequest.dictTypeClass !=''">
+            AND dict_type_class = #{dictTypeRequest.dictTypeClass}
+        </if>
         <if test="dictTypeRequest.dictTypeDesc != null and dictTypeRequest.dictTypeDesc !=''">
             AND dict_type_desc like CONCAT('%', #{dictTypeRequest.dictTypeDesc}, '%')
         </if>