menu

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -114,7 +114,6 @@ public class SysUserController extends PaginationController<SysUser> {
 
     /**
      * 查询菜单
-     *
      * @param user
      * @return
      */

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -26,7 +26,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "and su.corp_id = #{corpId} " +
 
             "<if test=\"name!=null and name != ''\"> and su.name like CONCAT('%',#{name},'%') </if>" +
-            "<if test=\"roleName!=null and roleName != ''\"> and sr.role_name = #{roleName}</if>" +
+            "<if test=\"roleName!=null and roleName != ''\"> and sr.r_name = #{roleName}</if>" +
             "<if test=\"flag!=null and flag != ''\"> and su.flag = #{flag}</if></script>")
     @ResultMap(value = "BaseResultMap")
     List<SysUser> queryUsers(QuerySysUserDTO dto);
@@ -50,7 +50,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "</script>")
     int stopFlag(@Param("businessId") List<String> businessId);
 
-    @Select("<script>select ur.user_id from s_r_user_role ur left JOIN tm_admin_role  sr on ur.role_id = sr.r_id where sr.role_name in" +
+    @Select("<script>select ur.user_id from s_r_user_role ur left JOIN tm_admin_role  sr on ur.role_id = sr.r_id where sr.r_name in" +
             "<foreach item='item' index='index' collection='roleName' open='(' separator=',' close=')'> #{item} </foreach> " +
             "</script>")
     List<String> adminId(@Param("roleName") List<String> roleName);
@@ -136,7 +136,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Delete("<script>delete from s_r_user_role where user_id = #{businessId}</script>")
     int deleteUserRole(String businessId);
 
-    @Select("<script>select su.*,ba.`name` as agencyName,sr.role_name as roleName,sr.business_id as roleId from s_user su " +
+    @Select("<script>select su.*,ba.`name` as agencyName,sr.r_name as roleName,sr.business_id as roleId from s_user su " +
             "LEFT JOIN s_r_user_role sru on su.business_id = sru.user_id " +
             "LEFT JOIN tm_admin_role sr on sru.role_id = sr.r_id " +
             "where su.is_created = '1' and su.del_flag = 0 and su.flag = 1  " +