RuoYi
2024-06-29 2a73de34f0b82133656fd49f1a9a4916b0030c38
优化代码
3 files modified
14 ■■■■■ changed files
ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml 6 ●●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/role/selectUser.vue 6 ●●●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -26,7 +26,7 @@
        <result property="updateBy"       column="update_by"         />
        <result property="updateTime"     column="update_time"       />
        <result property="remark"         column="remark"            />
        <collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
        <collection  property="columns"   javaType="java.util.List"  resultMap="GenTableColumnResult" />
    </resultMap>
    
    <resultMap type="GenTableColumn" id="GenTableColumnResult">
@@ -79,7 +79,7 @@
    <select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
        select table_name, table_comment, create_time, update_time from information_schema.tables
        where table_schema = (select database())
        AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
        AND table_name NOT LIKE 'qrtz\_%' AND table_name NOT LIKE 'gen\_%'
        AND table_name NOT IN (select table_name from gen_table)
        <if test="tableName != null and tableName != ''">
            AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
@@ -98,7 +98,7 @@
    
    <select id="selectDbTableListByNames" resultMap="GenTableResult">
        select table_name, table_comment, create_time, update_time from information_schema.tables
        where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
        where table_name NOT LIKE 'qrtz\_%' and table_name NOT LIKE 'gen\_%' and table_schema = (select database())
        and table_name in
        <foreach collection="array" item="name" open="(" separator="," close=")">
             #{name}
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -41,7 +41,7 @@
        order by dict_sort asc
    </select>
    
    <select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
    <select id="selectDictDataByType" parameterType="String" resultMap="SysDictDataResult">
        <include refid="selectDictDataVo"/>
        where status = '0' and dict_type = #{dictType} order by dict_sort asc
    </select>
ruoyi-ui/src/views/system/role/selectUser.vue
@@ -127,10 +127,8 @@
      }
      authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
        this.$modal.msgSuccess(res.msg);
        if (res.code === 200) {
          this.visible = false;
          this.$emit("ok");
        }
        this.visible = false;
        this.$emit("ok");
      });
    }
  }