From cfa86bd4fe96561a143a37ace8c85b7bd22d0f83 Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期五, 03 九月 2021 09:39:40 +0800 Subject: [PATCH] !308 代码生成: 导入表时查询 新创建表的优先排序在前面 Merge pull request !308 from xiaoshitou/N/A --- ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 0a8bc70..c26cfe5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -33,6 +33,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> @@ -135,12 +138,8 @@ where role_id = #{roleId} </update> - <update id="updateRoleStatus" parameterType="SysRole"> - update sys_user set status = #{status} where user_id = #{userId} - </update> - <delete id="deleteRoleById" parameterType="Long"> - delete from sys_role where role_id = #{roleId} + update sys_role set del_flag = '2' where role_id = #{roleId} </delete> <delete id="deleteRoleByIds" parameterType="Long"> -- Gitblit v1.9.2