From 2a4a9ef52b0d76efb9712fd8d4268f658546f99f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 19 Oct 2023 16:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-api/src/main/resources/mapper/SysDictTypeMapper.xml |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml b/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
index 63a608b..e438644 100644
--- a/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
+++ b/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
@@ -12,5 +12,22 @@
                     <result column="update_time" property="updateTime" />
                     <result column="is_delete" property="isDelete" />
         </resultMap>
+    <select id="selectCodeList" resultType="com.moral.api.entity.SysDictData">
+        select t1.id,t1.dict_type_id,t1.dataKey,t1.dataValue from sys_dict_type t
+                             left join sys_dict_data t1 on t1.dict_type_id = t.id
+        where t.is_delete = 0 and t.name = #{code} and t1.dataKey = #{id} and t1.is_delete = 0
+        order by t1.create_time desc
+    </select>
 
+    <select id="selectIdList" resultType="com.moral.api.entity.SysDictData">
+        select DISTINCT t1.id,t1.dict_type_id,t1.dataKey,t1.dataValue from sys_dict_type t
+        left join sys_dict_data t1 on t1.dict_type_id = t.id
+        where t.is_delete = 0 and t.name = #{code} and
+        t1.dataKey in
+        <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+         and t1.is_delete = 0
+        order by t1.create_time desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0