From 9d8da28f2ed526dfd14d58d5c79b856cf79cd274 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 04 Jun 2020 16:00:06 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue
---
ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
index 57e53c7..cc15a51 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
@@ -38,6 +38,7 @@
AND status = #{status}
</if>
</where>
+ order by dict_sort asc
</select>
<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
@@ -62,11 +63,18 @@
<delete id="deleteDictDataById" parameterType="Long">
delete from sys_dict_data where dict_code = #{dictCode}
</delete>
+
+ <delete id="deleteDictDataByIds" parameterType="Long">
+ delete from sys_dict_data where dict_code in
+ <foreach collection="array" item="dictCode" open="(" separator="," close=")">
+ #{dictCode}
+ </foreach>
+ </delete>
<update id="updateDictData" parameterType="SysDictData">
update sys_dict_data
<set>
- <if test="dictSort != null and dictSort != ''">dict_sort = #{dictSort},</if>
+ <if test="dictSort != null">dict_sort = #{dictSort},</if>
<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
@@ -87,7 +95,7 @@
<insert id="insertDictData" parameterType="SysDictData">
insert into sys_dict_data(
- <if test="dictSort != null and dictSort != ''">dict_sort,</if>
+ <if test="dictSort != null">dict_sort,</if>
<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
<if test="dictValue != null and dictValue != ''">dict_value,</if>
<if test="dictType != null and dictType != ''">dict_type,</if>
@@ -99,7 +107,7 @@
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
)values(
- <if test="dictSort != null and dictSort != ''">#{dictSort},</if>
+ <if test="dictSort != null">#{dictSort},</if>
<if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
<if test="dictType != null and dictType != ''">#{dictType},</if>
--
Gitblit v1.9.2