RuoYi 1 год назад
Родитель
Сommit
2a73de34f0

+ 3 - 3
ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
26
 		<result property="updateBy"       column="update_by"         />
26
 		<result property="updateBy"       column="update_by"         />
27
 		<result property="updateTime"     column="update_time"       />
27
 		<result property="updateTime"     column="update_time"       />
28
 		<result property="remark"         column="remark"            />
28
 		<result property="remark"         column="remark"            />
29
-		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
29
+		<collection  property="columns"   javaType="java.util.List"  resultMap="GenTableColumnResult" />
30
 	</resultMap>
30
 	</resultMap>
31
 	
31
 	
32
 	<resultMap type="GenTableColumn" id="GenTableColumnResult">
32
 	<resultMap type="GenTableColumn" id="GenTableColumnResult">
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
79
 	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
79
 	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
80
 		select table_name, table_comment, create_time, update_time from information_schema.tables
80
 		select table_name, table_comment, create_time, update_time from information_schema.tables
81
 		where table_schema = (select database())
81
 		where table_schema = (select database())
82
-		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
82
+		AND table_name NOT LIKE 'qrtz\_%' AND table_name NOT LIKE 'gen\_%'
83
 		AND table_name NOT IN (select table_name from gen_table)
83
 		AND table_name NOT IN (select table_name from gen_table)
84
 		<if test="tableName != null and tableName != ''">
84
 		<if test="tableName != null and tableName != ''">
85
 			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
85
 			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
98
 	
98
 	
99
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
99
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
100
 		select table_name, table_comment, create_time, update_time from information_schema.tables
100
 		select table_name, table_comment, create_time, update_time from information_schema.tables
101
-		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
101
+		where table_name NOT LIKE 'qrtz\_%' and table_name NOT LIKE 'gen\_%' and table_schema = (select database())
102
 		and table_name in
102
 		and table_name in
103
 	    <foreach collection="array" item="name" open="(" separator="," close=")">
103
 	    <foreach collection="array" item="name" open="(" separator="," close=")">
104
  			#{name}
104
  			#{name}

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

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
41
 		order by dict_sort asc
41
 		order by dict_sort asc
42
 	</select>
42
 	</select>
43
 	
43
 	
44
-	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
44
+	<select id="selectDictDataByType" parameterType="String" resultMap="SysDictDataResult">
45
 		<include refid="selectDictDataVo"/>
45
 		<include refid="selectDictDataVo"/>
46
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc
46
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc
47
 	</select>
47
 	</select>

+ 2 - 4
ruoyi-ui/src/views/system/role/selectUser.vue

@@ -127,10 +127,8 @@ export default {
127
       }
127
       }
128
       authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
128
       authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
129
         this.$modal.msgSuccess(res.msg);
129
         this.$modal.msgSuccess(res.msg);
130
-        if (res.code === 200) {
131
-          this.visible = false;
132
-          this.$emit("ok");
133
-        }
130
+        this.visible = false;
131
+        this.$emit("ok");
134
       });
132
       });
135
     }
133
     }
136
   }
134
   }