修复
This commit is contained in:
		
							parent
							
								
									fc0d19d7f9
								
							
						
					
					
						commit
						a0c93cb2a9
					
				|  | @ -60,7 +60,7 @@ public class SysLoginController | ||||||
|      * @param userId 用户id |      * @param userId 用户id | ||||||
|      * @return 结果 |      * @return 结果 | ||||||
|      */ |      */ | ||||||
|     @PostMapping("/getToken") |     @GetMapping("/getToken") | ||||||
|     public AjaxResult getToken(Long userId) |     public AjaxResult getToken(Long userId) | ||||||
|     { |     { | ||||||
|         AjaxResult ajax = AjaxResult.success(); |         AjaxResult ajax = AjaxResult.success(); | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; | ||||||
| import org.apache.commons.lang3.builder.ToStringStyle; | import org.apache.commons.lang3.builder.ToStringStyle; | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  * 用户和角色关联 rl_user_role |  * 用户和角色关联 sys_user_role | ||||||
|  * |  * | ||||||
|  * @author ruoyi |  * @author ruoyi | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
|  | @ -59,7 +59,7 @@ | ||||||
| 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time | 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time | ||||||
| 		from sys_menu m | 		from sys_menu m | ||||||
| 		left join sys_role_menu rm on m.menu_id = rm.menu_id | 		left join sys_role_menu rm on m.menu_id = rm.menu_id | ||||||
| 		left join rl_user_role ur on rm.role_id = ur.role_id | 		left join sys_user_role ur on rm.role_id = ur.role_id | ||||||
| 		left join sys_role ro on ur.role_id = ro.role_id | 		left join sys_role ro on ur.role_id = ro.role_id | ||||||
| 		where ur.user_id = #{params.userId} | 		where ur.user_id = #{params.userId} | ||||||
| 		<if test="menuName != null and menuName != ''"> | 		<if test="menuName != null and menuName != ''"> | ||||||
|  | @ -78,7 +78,7 @@ | ||||||
| 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time | 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time | ||||||
| 		from sys_menu m | 		from sys_menu m | ||||||
| 			 left join sys_role_menu rm on m.menu_id = rm.menu_id | 			 left join sys_role_menu rm on m.menu_id = rm.menu_id | ||||||
| 			 left join rl_user_role ur on rm.role_id = ur.role_id | 			 left join sys_user_role ur on rm.role_id = ur.role_id | ||||||
| 			 left join sys_role ro on ur.role_id = ro.role_id | 			 left join sys_role ro on ur.role_id = ro.role_id | ||||||
| 			 left join rl_user u on ur.user_id = u.user_id | 			 left join rl_user u on ur.user_id = u.user_id | ||||||
| 		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0 | 		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0 | ||||||
|  | @ -100,14 +100,14 @@ | ||||||
| 		select distinct m.perms | 		select distinct m.perms | ||||||
| 		from sys_menu m | 		from sys_menu m | ||||||
| 			 left join sys_role_menu rm on m.menu_id = rm.menu_id | 			 left join sys_role_menu rm on m.menu_id = rm.menu_id | ||||||
| 			 left join rl_user_role ur on rm.role_id = ur.role_id | 			 left join sys_user_role ur on rm.role_id = ur.role_id | ||||||
| 	</select> | 	</select> | ||||||
| 
 | 
 | ||||||
| 	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String"> | 	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String"> | ||||||
| 		select distinct m.perms | 		select distinct m.perms | ||||||
| 		from sys_menu m | 		from sys_menu m | ||||||
| 			 left join sys_role_menu rm on m.menu_id = rm.menu_id | 			 left join sys_role_menu rm on m.menu_id = rm.menu_id | ||||||
| 			 left join rl_user_role ur on rm.role_id = ur.role_id | 			 left join sys_user_role ur on rm.role_id = ur.role_id | ||||||
| 			 left join sys_role r on r.role_id = ur.role_id | 			 left join sys_role r on r.role_id = ur.role_id | ||||||
| 		where m.status = '0' and r.status = '0' and ur.user_id = #{userId} | 		where m.status = '0' and r.status = '0' and ur.user_id = #{userId} | ||||||
| 	</select> | 	</select> | ||||||
|  |  | ||||||
|  | @ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||||||
| 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, | 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, | ||||||
|             r.status, r.del_flag, r.create_time, r.remark |             r.status, r.del_flag, r.create_time, r.remark | ||||||
|         from sys_role r |         from sys_role r | ||||||
| 	        left join rl_user_role ur on ur.role_id = r.role_id | 	        left join sys_user_role ur on ur.role_id = r.role_id | ||||||
| 	        left join rl_user u on u.user_id = ur.user_id | 	        left join rl_user u on u.user_id = ur.user_id | ||||||
| 	        left join sys_dept d on u.dept_id = d.dept_id | 	        left join sys_dept d on u.dept_id = d.dept_id | ||||||
|     </sql> |     </sql> | ||||||
|  | @ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||||||
| 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long"> | 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long"> | ||||||
| 		select r.role_id | 		select r.role_id | ||||||
|         from sys_role r |         from sys_role r | ||||||
| 	        left join rl_user_role ur on ur.role_id = r.role_id | 	        left join sys_user_role ur on ur.role_id = r.role_id | ||||||
| 	        left join rl_user u on u.user_id = ur.user_id | 	        left join rl_user u on u.user_id = ur.user_id | ||||||
| 	    where u.user_id = #{userId} | 	    where u.user_id = #{userId} | ||||||
| 	</select> | 	</select> | ||||||
|  |  | ||||||
|  | @ -10,33 +10,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||||||
| 	</resultMap> | 	</resultMap> | ||||||
| 
 | 
 | ||||||
| 	<delete id="deleteUserRoleByUserId" parameterType="Long"> | 	<delete id="deleteUserRoleByUserId" parameterType="Long"> | ||||||
| 		delete from rl_user_role where user_id=#{userId}RlUserRole | 		delete from sys_user_role where user_id=#{userId}RlUserRole | ||||||
| 	</delete> | 	</delete> | ||||||
| 
 | 
 | ||||||
| 	<select id="countUserRoleByRoleId" resultType="Integer"> | 	<select id="countUserRoleByRoleId" resultType="Integer"> | ||||||
| 	    select count(1) from rl_user_role where role_id=#{roleId} | 	    select count(1) from sys_user_role where role_id=#{roleId} | ||||||
| 	</select> | 	</select> | ||||||
| 
 | 
 | ||||||
| 	<delete id="deleteUserRole" parameterType="Long"> | 	<delete id="deleteUserRole" parameterType="Long"> | ||||||
|  		delete from rl_user_role where user_id in |  		delete from sys_user_role where user_id in | ||||||
|  		<foreach collection="array" item="userId" open="(" separator="," close=")"> |  		<foreach collection="array" item="userId" open="(" separator="," close=")"> | ||||||
|  			#{userId} |  			#{userId} | ||||||
|         </foreach> |         </foreach> | ||||||
|  	</delete> |  	</delete> | ||||||
| 
 | 
 | ||||||
| 	<insert id="batchUserRole"> | 	<insert id="batchUserRole"> | ||||||
| 		insert into rl_user_role(user_id, role_id) values | 		insert into sys_user_role(user_id, role_id) values | ||||||
| 		<foreach item="item" index="index" collection="list" separator=","> | 		<foreach item="item" index="index" collection="list" separator=","> | ||||||
| 			(#{item.userId},#{item.roleId}) | 			(#{item.userId},#{item.roleId}) | ||||||
| 		</foreach> | 		</foreach> | ||||||
| 	</insert> | 	</insert> | ||||||
| 
 | 
 | ||||||
| 	<delete id="deleteUserRoleInfo" parameterType="SysUserRole"> | 	<delete id="deleteUserRoleInfo" parameterType="SysUserRole"> | ||||||
| 		delete from rl_user_role where user_id=#{userId} and role_id=#{roleId} | 		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} | ||||||
| 	</delete> | 	</delete> | ||||||
| 
 | 
 | ||||||
| 	<delete id="deleteUserRoleInfos"> | 	<delete id="deleteUserRoleInfos"> | ||||||
| 	    delete from rl_user_role where role_id=#{roleId} and user_id in | 	    delete from sys_user_role where role_id=#{roleId} and user_id in | ||||||
|  	    <foreach collection="userIds" item="userId" open="(" separator="," close=")"> |  	    <foreach collection="userIds" item="userId" open="(" separator="," close=")"> | ||||||
|  	        #{userId} |  	        #{userId} | ||||||
|             </foreach> |             </foreach> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user