Procházet zdrojové kódy

1、修复dict_sort不可update为0的问题;
2、查询返回增加dict_sort升序排序

小驴 před 5 roky
rodič
revize
0edebc83a0

+ 3 - 2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
38 38
 				AND status = #{status}
39 39
 			</if>
40 40
 		</where>
41
+		order by dict_sort asc
41 42
 	</select>
42 43
 	
43 44
 	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
@@ -73,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
73 74
 	<update id="updateDictData" parameterType="SysDictData">
74 75
  		update sys_dict_data
75 76
  		<set>
76
- 			<if test="dictSort != null and dictSort != ''">dict_sort = #{dictSort},</if>
77
+ 			<if test="dictSort != null">dict_sort = #{dictSort},</if>
77 78
  			<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
78 79
  			<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
79 80
  			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
@@ -94,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
94 95
  	
95 96
  	<insert id="insertDictData" parameterType="SysDictData">
96 97
  		insert into sys_dict_data(
97
- 			<if test="dictSort != null and dictSort != ''">dict_sort,</if>
98
+ 			<if test="dictSort != null">dict_sort,</if>
98 99
  			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
99 100
  			<if test="dictValue != null and dictValue != ''">dict_value,</if>
100 101
  			<if test="dictType != null and dictType != ''">dict_type,</if>