发布 v3.1.0

ruoyi/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -92,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="genTable.params.endTime != null and genTable.params.endTime != ''"><!-- 结束时间检索 -->
 			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{genTable.params.endTime},'%y%m%d')
 		</if>
+		order by create_time desc
 	</select>
 
 
@@ -130,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
 			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 		</if>
+        order by create_time desc
 	</select>
 	
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
@@ -162,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
 		where t.table_name = #{tableName} order by c.sort
 	</select>
-
+	
 	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
 	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort

ruoyi/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -30,6 +30,9 @@
     <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
+		<if test="deptId != null and deptId != 0">
+			AND dept_id = #{deptId}
+		</if>
         <if test="parentId != null and parentId != 0">
             AND parent_id = #{parentId}
         </if>

ruoyi/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -75,13 +75,13 @@
         left join sys_role ro on ur.role_id = ro.role_id
         where ur.user_id = #{params.userId}
         <if test="menuName != null and menuName != ''">
-            AND menu_name like concat('%', #{menuName}, '%')
+            AND m.menu_name like concat('%', #{menuName}, '%')
         </if>
         <if test="visible != null and visible != ''">
-            AND visible = #{visible}
+            AND m.visible = #{visible}
         </if>
         <if test="status != null and status != ''">
-            AND status = #{status}
+            AND m.status = #{status}
         </if>
         order by m.parent_id, m.order_num
     </select>

ruoyi/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -42,6 +42,9 @@
     <select id="selectPageRoleList" parameterType="SysRole" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
         where r.del_flag = '0'
+        <if test="role.roleId != null and role.roleId != 0">
+            AND r.role_id = #{role.roleId}
+        </if>
         <if test="role.roleName != null and role.roleName != ''">
             AND r.role_name like concat('%', #{role.roleName}, '%')
         </if>
@@ -67,6 +70,9 @@
     <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
         where r.del_flag = '0'
+        <if test="roleId != null and roleId != 0">
+            AND r.role_id = #{roleId}
+        </if>
         <if test="roleName != null and roleName != ''">
             AND r.role_name like concat('%', #{roleName}, '%')
         </if>

ruoyi/src/main/resources/mapper/system/SysUserMapper.xml

@@ -86,6 +86,9 @@
         sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         where u.del_flag = '0'
+        <if test="user.userId != null and user.userId != 0">
+            AND u.user_id = #{user.userId}
+        </if>
         <if test="user.userName != null and user.userName != ''">
             AND u.user_name like concat('%', #{user.userName}, '%')
         </if>
@@ -117,6 +120,9 @@
         sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         where u.del_flag = '0'
+        <if test="userId != null and userId != 0">
+            AND u.user_id = #{userId}
+        </if>
         <if test="userName != null and userName != ''">
             AND u.user_name like concat('%', #{userName}, '%')
         </if>