From ef5adf2e2a4134fd06ae1432df96434de0538ec3 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Thu, 04 Jun 2020 14:53:24 +0800
Subject: [PATCH] update ruoyi-ui/src/permission.js. 修复退出登录重定向到登录页，登录后参数丢失。/article?id=6
---
ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
index b610053..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">
@@ -73,7 +74,7 @@
<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>
@@ -94,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>
@@ -106,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