Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-07-06 aa14085746f7432e61f138c9369e6afa8d34c60c

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev


 Conflicts:

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

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

	ruoyi-ui/src/api/system/role.js

	ruoyi-ui/src/api/system/user.js

	ruoyi-ui/src/assets/styles/ruoyi.scss

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/views/system/role/index.vue

	ruoyi-ui/src/views/system/user/index.vue

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -6,6 +6,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
@@ -14,6 +15,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +27,7 @@

/**
 * è§’色信息
 * 
 *
 * @author ruoyi
 */
@RestController
@@ -171,4 +173,59 @@
    {
        return AjaxResult.success(roleService.selectRoleAll());
    }

    /**
     * æŸ¥è¯¢å·²åˆ†é…ç”¨æˆ·è§’色列表
     */
    @PreAuthorize("@ss.hasPermi('system:role:list')")
    @GetMapping("/authUser/allocatedList")
    public TableDataInfo allocatedList(SysUser user)
    {
        startPage();
        List<SysUser> list = userService.selectAllocatedList(user);
        return getDataTable(list);
    }

    /**
     * æŸ¥è¯¢æœªåˆ†é…ç”¨æˆ·è§’色列表
     */
    @PreAuthorize("@ss.hasPermi('system:role:list')")
    @GetMapping("/authUser/unallocatedList")
    public TableDataInfo unallocatedList(SysUser user)
    {
        startPage();
        List<SysUser> list = userService.selectUnallocatedList(user);
        return getDataTable(list);
    }

    /**
     * å–消授权用户
     */
    @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/cancel")
    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
    {
        return toAjax(roleService.deleteAuthUser(userRole));
    }

    /**
     * æ‰¹é‡å–消授权用户
     */
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/cancelAll")
    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
    {
        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
    }

    /**
     * æ‰¹é‡é€‰æ‹©ç”¨æˆ·æŽˆæƒ
     */
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/selectAll")
    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
    {
        return toAjax(roleService.insertAuthUsers(roleId, userIds));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -196,4 +196,31 @@
        user.setUpdateBy(SecurityUtils.getUsername());
        return toAjax(userService.updateUserStatus(user));
    }

    /**
     * æ ¹æ®ç”¨æˆ·ç¼–号获取授权角色
     */
    @PreAuthorize("@ss.hasPermi('system:user:query')")
    @GetMapping("/authRole/{userId}")
    public AjaxResult authRole(@PathVariable("userId") Long userId)
    {
        AjaxResult ajax = AjaxResult.success();
        SysUser user = userService.selectUserById(userId);
        List<SysRole> roles = roleService.selectRolesByUserId(userId);
        ajax.put("user", user);
        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
        return ajax;
    }

    /**
     * ç”¨æˆ·æŽˆæƒè§’色
     */
    @PreAuthorize("@ss.hasPermi('system:user:edit')")
    @Log(title = "用户管理", businessType = BusinessType.GRANT)
    @PutMapping("/authRole")
    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
    {
        userService.insertUserAuth(userId, roleIds);
        return success();
    }
}

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -148,6 +148,10 @@
    @TableField(exist = false)
    private Long[] postIds;

    /** è§’色ID */
    @TableField(exist = false)
    private Long roleId;

    public SysUser(Long userId)
    {
        this.userId = userId;

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -25,6 +25,22 @@
    public List<SysUser> selectUserList(SysUser sysUser);

    /**
     * æ ¹æ®æ¡ä»¶åˆ†é¡µæŸ¥è¯¢æœªå·²é…ç”¨æˆ·è§’色列表
     *
     * @param user ç”¨æˆ·ä¿¡æ¯
     * @return ç”¨æˆ·ä¿¡æ¯é›†åˆä¿¡æ¯
     */
    public List<SysUser> selectAllocatedList(SysUser user);

    /**
     * æ ¹æ®æ¡ä»¶åˆ†é¡µæŸ¥è¯¢æœªåˆ†é…ç”¨æˆ·è§’色列表
     *
     * @param user ç”¨æˆ·ä¿¡æ¯
     * @return ç”¨æˆ·ä¿¡æ¯é›†åˆä¿¡æ¯
     */
    public List<SysUser> selectUnallocatedList(SysUser user);

    /**
     * é€šè¿‡ç”¨æˆ·åæŸ¥è¯¢ç”¨æˆ·
     *
     * @param userName ç”¨æˆ·å

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -3,6 +3,8 @@
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysUserRole;

import java.util.List;
import java.util.Set;
@@ -26,7 +28,15 @@
    public List<SysRole> selectRoleList(SysRole role);

    /**
     * æ ¹æ®ç”¨æˆ·ID查询角色
     * æ ¹æ®ç”¨æˆ·ID查询角色列表
     *
     * @param userId ç”¨æˆ·ID
     * @return è§’色列表
     */
    public List<SysRole> selectRolesByUserId(Long userId);

    /**
     * æ ¹æ®ç”¨æˆ·ID查询角色权限
     *
     * @param userId ç”¨æˆ·ID
     * @return æƒé™åˆ—表
@@ -134,4 +144,30 @@
     * @return ç»“æžœ
     */
    public int deleteRoleByIds(Long[] roleIds);

    /**
     * å–消授权用户角色
     *
     * @param userRole ç”¨æˆ·å’Œè§’色关联信息
     * @return ç»“æžœ
     */
    public int deleteAuthUser(SysUserRole userRole);

    /**
     * æ‰¹é‡å–消授权用户角色
     *
     * @param roleId è§’色ID
     * @param userIds éœ€è¦å–消授权的用户数据ID
     * @return ç»“æžœ
     */
    public int deleteAuthUsers(Long roleId, Long[] userIds);

    /**
     * æ‰¹é‡é€‰æ‹©æŽˆæƒç”¨æˆ·è§’色
     *
     * @param roleId è§’色ID
     * @param userIds éœ€è¦åˆ é™¤çš„用户数据ID
     * @return ç»“æžœ
     */
    public int insertAuthUsers(Long roleId, Long[] userIds);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -25,6 +25,22 @@
    public List<SysUser> selectUserList(SysUser user);

    /**
     * æ ¹æ®æ¡ä»¶åˆ†é¡µæŸ¥è¯¢å·²åˆ†é…ç”¨æˆ·è§’色列表
     *
     * @param user ç”¨æˆ·ä¿¡æ¯
     * @return ç”¨æˆ·ä¿¡æ¯é›†åˆä¿¡æ¯
     */
    public List<SysUser> selectAllocatedList(SysUser user);

    /**
     * æ ¹æ®æ¡ä»¶åˆ†é¡µæŸ¥è¯¢æœªåˆ†é…ç”¨æˆ·è§’色列表
     *
     * @param user ç”¨æˆ·ä¿¡æ¯
     * @return ç”¨æˆ·ä¿¡æ¯é›†åˆä¿¡æ¯
     */
    public List<SysUser> selectUnallocatedList(SysUser user);

    /**
     * é€šè¿‡ç”¨æˆ·åæŸ¥è¯¢ç”¨æˆ·
     *
     * @param userName ç”¨æˆ·å
@@ -104,6 +120,14 @@
    public int updateUser(SysUser user);

    /**
     * ç”¨æˆ·æŽˆæƒè§’色
     *
     * @param userId ç”¨æˆ·ID
     * @param roleIds è§’色组
     */
    public void insertUserAuth(Long userId, Long[] roleIds);

    /**
     * ä¿®æ”¹ç”¨æˆ·çŠ¶æ€
     *
     * @param user ç”¨æˆ·ä¿¡æ¯
@@ -123,7 +147,7 @@
     * ä¿®æ”¹ç”¨æˆ·å¤´åƒ
     *
     * @param userName ç”¨æˆ·å
     * @param avatar   å¤´åƒåœ°å€
     * @param avatar å¤´åƒåœ°å€
     * @return ç»“æžœ
     */
    public boolean updateUserAvatar(String userName, String avatar);
@@ -164,9 +188,9 @@
    /**
     * å¯¼å…¥ç”¨æˆ·æ•°æ®
     *
     * @param userList        ç”¨æˆ·æ•°æ®åˆ—表
     * @param userList ç”¨æˆ·æ•°æ®åˆ—表
     * @param isUpdateSupport æ˜¯å¦æ›´æ–°æ”¯æŒï¼Œå¦‚果已存在，则进行更新数据
     * @param operName        æ“ä½œç”¨æˆ·
     * @param operName æ“ä½œç”¨æˆ·
     * @return ç»“æžœ
     */
    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -60,6 +60,31 @@
    }

    /**
     * æ ¹æ®ç”¨æˆ·ID查询角色
     *
     * @param userId ç”¨æˆ·ID
     * @return è§’色列表
     */
    @Override
    public List<SysRole> selectRolesByUserId(Long userId)
    {
        List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
        List<SysRole> roles = selectRoleAll();
        for (SysRole role : roles)
        {
            for (SysRole userRole : userRoles)
            {
                if (role.getRoleId().longValue() == userRole.getRoleId().longValue())
                {
                    role.setFlag(true);
                    break;
                }
            }
        }
        return roles;
    }

    /**
     * æ ¹æ®ç”¨æˆ·ID查询权限
     *
     * @param userId ç”¨æˆ·ID
@@ -305,4 +330,51 @@
        roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().in(SysRoleDept::getRoleId, ids));
        return baseMapper.deleteBatchIds(ids);
    }

    /**
     * å–消授权用户角色
     *
     * @param userRole ç”¨æˆ·å’Œè§’色关联信息
     * @return ç»“æžœ
     */
    @Override
    public int deleteAuthUser(SysUserRole userRole)
    {
        return userRoleMapper.deleteUserRoleInfo(userRole);
    }

    /**
     * æ‰¹é‡å–消授权用户角色
     *
     * @param roleId è§’色ID
     * @param userIds éœ€è¦å–消授权的用户数据ID
     * @return ç»“æžœ
     */
    @Override
    public int deleteAuthUsers(Long roleId, Long[] userIds)
    {
        return userRoleMapper.deleteUserRoleInfos(roleId, userIds);
    }

    /**
     * æ‰¹é‡é€‰æ‹©æŽˆæƒç”¨æˆ·è§’色
     *
     * @param roleId è§’色ID
     * @param userIds éœ€è¦åˆ é™¤çš„用户数据ID
     * @return ç»“æžœ
     */
    @Override
    public int insertAuthUsers(Long roleId, Long[] userIds)
    {
        // æ–°å¢žç”¨æˆ·ä¸Žè§’色管理
        List<SysUserRole> list = new ArrayList<SysUserRole>();
        for (Long userId : userIds)
        {
            SysUserRole ur = new SysUserRole();
            ur.setUserId(userId);
            ur.setRoleId(roleId);
            list.add(ur);
        }
        return userRoleMapper.batchUserRole(list);
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -70,6 +70,32 @@
    }

    /**
     * æ ¹æ®æ¡ä»¶åˆ†é¡µæŸ¥è¯¢å·²åˆ†é…ç”¨æˆ·è§’色列表
     *
     * @param user ç”¨æˆ·ä¿¡æ¯
     * @return ç”¨æˆ·ä¿¡æ¯é›†åˆä¿¡æ¯
     */
    @Override
    @DataScope(deptAlias = "d", userAlias = "u")
    public List<SysUser> selectAllocatedList(SysUser user)
    {
        return userMapper.selectAllocatedList(user);
    }

    /**
     * æ ¹æ®æ¡ä»¶åˆ†é¡µæŸ¥è¯¢æœªåˆ†é…ç”¨æˆ·è§’色列表
     *
     * @param user ç”¨æˆ·ä¿¡æ¯
     * @return ç”¨æˆ·ä¿¡æ¯é›†åˆä¿¡æ¯
     */
    @Override
    @DataScope(deptAlias = "d", userAlias = "u")
    public List<SysUser> selectUnallocatedList(SysUser user)
    {
        return userMapper.selectUnallocatedList(user);
    }

    /**
     * é€šè¿‡ç”¨æˆ·åæŸ¥è¯¢ç”¨æˆ·
     *
     * @param userName ç”¨æˆ·å
@@ -232,6 +258,19 @@
    }

    /**
     * ç”¨æˆ·æŽˆæƒè§’色
     *
     * @param userId ç”¨æˆ·ID
     * @param roleIds è§’色组
     */
    @Override
    public void insertUserAuth(Long userId, Long[] roleIds)
    {
        userRoleMapper.deleteUserRoleByUserId(userId);
        insertUserRole(userId, roleIds);
    }

    /**
     * ä¿®æ”¹ç”¨æˆ·çŠ¶æ€
     *
     * @param user ç”¨æˆ·ä¿¡æ¯
@@ -257,7 +296,7 @@
     * ä¿®æ”¹ç”¨æˆ·å¤´åƒ
     *
     * @param userName ç”¨æˆ·å
     * @param avatar   å¤´åƒåœ°å€
     * @param avatar å¤´åƒåœ°å€
     * @return ç»“æžœ
     */
    @Override
@@ -339,6 +378,32 @@
    }

    /**
     * æ–°å¢žç”¨æˆ·è§’色信息
     *
     * @param userId ç”¨æˆ·ID
     * @param roleIds è§’色组
     */
    public void insertUserRole(Long userId, Long[] roleIds)
    {
        if (StringUtils.isNotNull(roleIds))
        {
            // æ–°å¢žç”¨æˆ·ä¸Žè§’色管理
            List<SysUserRole> list = new ArrayList<SysUserRole>();
            for (Long roleId : roleIds)
            {
                SysUserRole ur = new SysUserRole();
                ur.setUserId(userId);
                ur.setRoleId(roleId);
                list.add(ur);
            }
            if (list.size() > 0)
            {
                userRoleMapper.batchUserRole(list);
            }
        }
    }

    /**
     * é€šè¿‡ç”¨æˆ·ID删除用户
     *
     * @param userId ç”¨æˆ·ID
@@ -377,9 +442,9 @@
    /**
     * å¯¼å…¥ç”¨æˆ·æ•°æ®
     *
     * @param userList        ç”¨æˆ·æ•°æ®åˆ—表
     * @param userList ç”¨æˆ·æ•°æ®åˆ—表
     * @param isUpdateSupport æ˜¯å¦æ›´æ–°æ”¯æŒï¼Œå¦‚果已存在，则进行更新数据
     * @param operName        æ“ä½œç”¨æˆ·
     * @param operName æ“ä½œç”¨æˆ·
     * @return ç»“æžœ
     */
    @Override

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

@@ -75,9 +75,9 @@
               r.data_scope,
               r.status as role_status
        from sys_user u
                 left join sys_dept d on u.dept_id = d.dept_id
                 left join sys_user_role ur on u.user_id = ur.user_id
                 left join sys_role r on r.role_id = ur.role_id
            left join sys_dept d on u.dept_id = d.dept_id
            left join sys_user_role ur on u.user_id = ur.user_id
            left join sys_role r on r.role_id = ur.role_id
    </sql>

    <select id="selectPageUserList" parameterType="SysUser" resultMap="SysUserResult">
@@ -142,6 +142,45 @@
        </if>
    </select>

    <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
        from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
             left join sys_user_role ur on u.user_id = ur.user_id
             left join sys_role r on r.role_id = ur.role_id
        where u.del_flag = '0' and r.role_id = #{roleId}
        <if test="userName != null and userName != ''">
            AND u.user_name like concat('%', #{userName}, '%')
        </if>
        <if test="phonenumber != null and phonenumber != ''">
            AND u.phonenumber like concat('%', #{phonenumber}, '%')
        </if>
        <!-- æ•°æ®èŒƒå›´è¿‡æ»¤ -->
        <if test="params.dataScope != null and params.dataScope != ''">
            AND ( ${params.dataScope} )
        </if>
    </select>

    <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
        from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
             left join sys_user_role ur on u.user_id = ur.user_id
             left join sys_role r on r.role_id = ur.role_id
        where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
        and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
        <if test="userName != null and userName != ''">
            AND u.user_name like concat('%', #{userName}, '%')
        </if>
        <if test="phonenumber != null and phonenumber != ''">
            AND u.phonenumber like concat('%', #{phonenumber}, '%')
        </if>
        <!-- æ•°æ®èŒƒå›´è¿‡æ»¤ -->
        <if test="params.dataScope != null and params.dataScope != ''">
            AND ( ${params.dataScope} )
        </if>
    </select>

    <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
        <include refid="selectUserVo"/>
        where u.user_name = #{userName}

 ruoyi-ui/src/api/system/role.js

@@ -72,4 +72,50 @@
    method: 'get',
    params: query
  })
}
}


// æŸ¥è¯¢è§’色已授权用户列表
export function allocatedUserList(query) {
  return request({
    url: '/system/role/authUser/allocatedList',
    method: 'get',
    params: query
  })
}

// æŸ¥è¯¢è§’色未授权用户列表
export function unallocatedUserList(query) {
  return request({
    url: '/system/role/authUser/unallocatedList',
    method: 'get',
    params: query
  })
}

// å–消用户授权角色
export function authUserCancel(data) {
  return request({
    url: '/system/role/authUser/cancel',
    method: 'put',
    data: data
  })
}

// æ‰¹é‡å–消用户授权角色
export function authUserCancelAll(data) {
  return request({
    url: '/system/role/authUser/cancelAll',
    method: 'put',
    params: data
  })
}

// æŽˆæƒç”¨æˆ·é€‰æ‹©
export function authUserSelectAll(data) {
  return request({
    url: '/system/role/authUser/selectAll',
    method: 'put',
    params: data
  })
}

 ruoyi-ui/src/api/system/user.js

@@ -125,3 +125,20 @@
    method: 'get'
  })
}

// æŸ¥è¯¢æŽˆæƒè§’色
export function getAuthRole(userId) {
  return request({
    url: '/system/user/authRole/' + userId,
    method: 'get'
  })
}

// ä¿å­˜æŽˆæƒè§’色
export function updateAuthRole(data) {
  return request({
    url: '/system/user/authRole',
    method: 'put',
    params: data
  })
}

 ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -53,6 +53,13 @@
    margin-left: 20px;
}

.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
    font-family: inherit;
    font-weight: 500;
    line-height: 1.1;
    color: inherit;
}

.el-dialog:not(.is-fullscreen){
    margin-top: 6vh !important;
}
@@ -120,6 +127,17 @@
    width: inherit;
}

/** è¡¨æ ¼æ›´å¤šæ“ä½œä¸‹æ‹‰æ ·å¼ */
.el-table .el-dropdown-link {
    cursor: pointer;
    color: #1890ff;
    margin-left: 5px;
}

.el-table .el-dropdown, .el-icon-arrow-down {
    font-size: 12px;
}

.el-tree-node__content > .el-checkbox {
    margin-right: 8px;
}

 ruoyi-ui/src/router/index.js

@@ -81,6 +81,32 @@
    ]
  },
  {
    path: '/auth',
    component: Layout,
    hidden: true,
    children: [
      {
        path: 'role/:userId(\\d+)',
        component: (resolve) => require(['@/views/system/user/authRole'], resolve),
        name: 'AuthRole',
        meta: { title: '分配角色'}
      }
    ]
  },
  {
    path: '/auth',
    component: Layout,
    hidden: true,
    children: [
      {
        path: 'user/:roleId(\\d+)',
        component: (resolve) => require(['@/views/system/role/authUser'], resolve),
        name: 'AuthUser',
        meta: { title: '分配用户'}
      }
    ]
  },
  {
    path: '/dict',
    component: Layout,
    hidden: true,

 ruoyi-ui/src/views/system/role/authUser.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,213 @@
<template>

  <div class="app-container">

     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">

      <el-form-item label="用户名称" prop="userName">

        <el-input

          v-model="queryParams.userName"

          placeholder="请输入用户名称"

          clearable

          size="small"

          style="width: 240px"

          @keyup.enter.native="handleQuery"

        />

      </el-form-item>

      <el-form-item label="手机号码" prop="phonenumber">

        <el-input

          v-model="queryParams.phonenumber"

          placeholder="请输入手机号码"

          clearable

          size="small"

          style="width: 240px"

          @keyup.enter.native="handleQuery"

        />

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>



    <el-row :gutter="10" class="mb8">

      <el-col :span="1.5">

        <el-button

          type="primary"

          plain

          icon="el-icon-plus"

          size="mini"

          @click="openSelectUser"

          v-hasPermi="['system:role:add']"

        >添加用户</el-button>

      </el-col>

      <el-col :span="1.5">

        <el-button

          type="danger"

          plain

          icon="el-icon-circle-close"

          size="mini"

          :disabled="multiple"

          @click="cancelAuthUserAll"

          v-hasPermi="['system:role:remove']"

        >批量取消授权</el-button>

      </el-col>

      <el-col :span="1.5">

        <el-button

          type="warning"

          plain

          icon="el-icon-close"

          size="mini"

          @click="handleClose"

        >关闭</el-button>

      </el-col>

      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

    </el-row>



    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">

      <el-table-column type="selection" width="55" align="center" />

      <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />

      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />

      <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />

      <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />

      <el-table-column label="状态" align="center" prop="status">

        <template slot-scope="scope">

          <dict-tag :options="statusOptions" :value="scope.row.status"/>

        </template>

      </el-table-column>

      <el-table-column label="创建时间" align="center" prop="createTime" width="180">

        <template slot-scope="scope">

          <span>{{ parseTime(scope.row.createTime) }}</span>

        </template>

      </el-table-column>

      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

        <template slot-scope="scope">

          <el-button

            size="mini"

            type="text"

            icon="el-icon-circle-close"

            @click="cancelAuthUser(scope.row)"

            v-hasPermi="['system:role:remove']"

          >取消授权</el-button>

        </template>

      </el-table-column>

    </el-table>



    <pagination

      v-show="total>0"

      :total="total"

      :page.sync="queryParams.pageNum"

      :limit.sync="queryParams.pageSize"

      @pagination="getList"

    />

    <select-user ref="select" :roleId="queryParams.roleId" @ok="handleQuery" />

  </div>

</template>



<script>

import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";

import selectUser from "./selectUser";



export default {

  name: "AuthUser",

  components: { selectUser },

  data() {

    return {

      // é®ç½©å±‚

      loading: true,

      // é€‰ä¸­ç”¨æˆ·ç»„

      userIds: [],

      // éžå¤šä¸ªç¦ç”¨

      multiple: true,

      // æ˜¾ç¤ºæœç´¢æ¡ä»¶

      showSearch: true,

      // æ€»æ¡æ•°

      total: 0,

      // ç”¨æˆ·è¡¨æ ¼æ•°æ®

      userList: [],

      // çŠ¶æ€æ•°æ®å­—å…¸

      statusOptions: [],

      // æŸ¥è¯¢å‚æ•°

      queryParams: {

        pageNum: 1,

        pageSize: 10,

        roleId: undefined,

        userName: undefined,

        phonenumber: undefined

      }

    };

  },

  created() {

    const roleId = this.$route.params && this.$route.params.roleId;

    if (roleId) {

      this.queryParams.roleId = roleId;

      this.getList();

      this.getDicts("sys_normal_disable").then(response => {

        this.statusOptions = response.data;

      });

    }

  },

  methods: {

    /** æŸ¥è¯¢æŽˆæƒç”¨æˆ·åˆ—表 */

    getList() {

      this.loading = true;

      allocatedUserList(this.queryParams).then(response => {

          this.userList = response.rows;

          this.total = response.total;

          this.loading = false;

        }

      );

    },

    // è¿”回按钮

    handleClose() {

      this.$store.dispatch("tagsView/delView", this.$route);

      this.$router.push({ path: "/system/role" });

    },

    /** æœç´¢æŒ‰é’®æ“ä½œ */

    handleQuery() {

      this.queryParams.pageNum = 1;

      this.getList();

    },

    /** é‡ç½®æŒ‰é’®æ“ä½œ */

    resetQuery() {

      this.resetForm("queryForm");

      this.handleQuery();

    },

    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®

    handleSelectionChange(selection) {

      this.userIds = selection.map(item => item.userId)

      this.multiple = !selection.length

    },

    /** æ‰“开授权用户表弹窗 */

    openSelectUser() {

      this.$refs.select.show();

    },

    /** å–消授权按钮操作 */

    cancelAuthUser(row) {

      const roleId = this.queryParams.roleId;

      this.$confirm('确认要取消该用户"' + row.userName + '"角色吗？', "警告", {

        confirmButtonText: "确定",

        cancelButtonText: "取消",

        type: "warning"

      }).then(function() {

        return authUserCancel({ userId: row.userId, roleId: roleId });

      }).then(() => {

        this.getList();

        this.msgSuccess("取消授权成功");

      }).catch(() => {});

    },

    /** æ‰¹é‡å–消授权按钮操作 */

    cancelAuthUserAll(row) {

      const roleId = this.queryParams.roleId;

      const userIds = this.userIds.join(",");

      this.$confirm('是否取消选中用户授权数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

      }).then(() => {

          return authUserCancelAll({ roleId: roleId, userIds: userIds });

      }).then(() => {

        this.getList();

        this.msgSuccess("取消授权成功");

      }).catch(() => {});

    }

  }

};

</script>

 ruoyi-ui/src/views/system/role/index.vue

@@ -124,7 +124,7 @@
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
            size="mini"
            type="text"
@@ -135,17 +135,21 @@
          <el-button
            size="mini"
            type="text"
            icon="el-icon-circle-check"
            @click="handleDataScope(scope.row)"
            v-hasPermi="['system:role:edit']"
          >数据权限</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
            <span class="el-dropdown-link">
              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </template>
      </el-table-column>
    </el-table>
@@ -469,6 +473,19 @@
      this.single = selection.length!=1
      this.multiple = !selection.length
    },
    // æ›´å¤šæ“ä½œè§¦å‘
    handleCommand(command, row) {
      switch (command) {
        case "handleDataScope":
          this.handleDataScope(row);
          break;
        case "handleAuthUser":
          this.handleAuthUser(row);
          break;
        default:
          break;
      }
    },
    // æ ‘权限（展开/折叠）
    handleCheckedTreeExpand(value, type) {
      if (type == 'menu') {
@@ -548,6 +565,11 @@
        this.title = "分配数据权限";
      });
    },
    /** åˆ†é…ç”¨æˆ·æ“ä½œ */
    handleAuthUser: function(row) {
      const roleId = row.roleId;
      this.$router.push("/auth/user/" + roleId);
    },
    /** æäº¤æŒ‰é’® */
    submitForm: function() {
      this.$refs["form"].validate(valid => {

 ruoyi-ui/src/views/system/role/selectUser.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,142 @@
<template>

  <!-- æŽˆæƒç”¨æˆ· -->

  <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>

    <el-form :model="queryParams" ref="queryForm" :inline="true">

      <el-form-item label="用户名称" prop="userName">

        <el-input

          v-model="queryParams.userName"

          placeholder="请输入用户名称"

          clearable

          size="small"

          @keyup.enter.native="handleQuery"

        />

      </el-form-item>

      <el-form-item label="手机号码" prop="phonenumber">

        <el-input

          v-model="queryParams.phonenumber"

          placeholder="请输入手机号码"

          clearable

          size="small"

          @keyup.enter.native="handleQuery"

        />

      </el-form-item>

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>

    <el-row>

      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">

        <el-table-column type="selection" width="55"></el-table-column>

        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />

        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />

        <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />

        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />

        <el-table-column label="状态" align="center" prop="status">

          <template slot-scope="scope">

            <dict-tag :options="statusOptions" :value="scope.row.status"/>

          </template>

        </el-table-column>

        <el-table-column label="创建时间" align="center" prop="createTime" width="180">

          <template slot-scope="scope">

            <span>{{ parseTime(scope.row.createTime) }}</span>

          </template>

        </el-table-column>

      </el-table>

      <pagination

        v-show="total>0"

        :total="total"

        :page.sync="queryParams.pageNum"

        :limit.sync="queryParams.pageSize"

        @pagination="getList"

      />

    </el-row>

    <div slot="footer" class="dialog-footer">

      <el-button type="primary" @click="handleSelectUser">ç¡® å®š</el-button>

      <el-button @click="visible = false">取 æ¶ˆ</el-button>

    </div>

  </el-dialog>

</template>



<script>

import { unallocatedUserList, authUserSelectAll } from "@/api/system/role";

export default {

  props: {

    // è§’色编号

    roleId: {

      type: Number

    }

  },

  data() {

    return {

      // é®ç½©å±‚

      visible: false,

      // é€‰ä¸­æ•°ç»„值

      userIds: [],

      // æ€»æ¡æ•°

      total: 0,

      // æœªæŽˆæƒç”¨æˆ·æ•°æ®

      userList: [],

      // çŠ¶æ€æ•°æ®å­—å…¸

      statusOptions: [],

      // æŸ¥è¯¢å‚æ•°

      queryParams: {

        pageNum: 1,

        pageSize: 10,

        roleId: undefined,

        userName: undefined,

        phonenumber: undefined

      }

    };

  },

  created() {

    this.getDicts("sys_normal_disable").then(response => {

      this.statusOptions = response.data;

    });

  },

  methods: {

    // æ˜¾ç¤ºå¼¹æ¡†

    show() {

      this.queryParams.roleId = this.roleId;

      this.getList();

      this.visible = true;

    },

    clickRow(row) {

      this.$refs.table.toggleRowSelection(row);

    },

    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®

    handleSelectionChange(selection) {

      this.userIds = selection.map(item => item.userId);

    },

    // æŸ¥è¯¢è¡¨æ•°æ®

    getList() {

      unallocatedUserList(this.queryParams).then(res => {

        this.userList = res.rows;

        this.total = res.total;

      });

    },

    /** æœç´¢æŒ‰é’®æ“ä½œ */

    handleQuery() {

      this.queryParams.pageNum = 1;

      this.getList();

    },

    /** é‡ç½®æŒ‰é’®æ“ä½œ */

    resetQuery() {

      this.resetForm("queryForm");

      this.handleQuery();

    },

    /** é€‰æ‹©æŽˆæƒç”¨æˆ·æ“ä½œ */

    handleSelectUser() {

      const roleId = this.queryParams.roleId;

      const userIds = this.userIds.join(",");

      authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {

        this.msgSuccess(res.msg);

        if (res.code === 200) {

          this.visible = false;

          this.$emit("ok");

        }

      });

    }

  }

};

</script>


 ruoyi-ui/src/views/system/user/authRole.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,117 @@
<template>

  <div class="app-container">

    <h4 class="form-header h4">基本信息</h4>

    <el-form ref="form" :model="form" label-width="80px">

      <el-row>

        <el-col :span="8" :offset="2">

          <el-form-item label="用户昵称" prop="nickName">

            <el-input v-model="form.nickName" disabled />

          </el-form-item>

        </el-col>

        <el-col :span="8" :offset="2">

          <el-form-item label="登录账号" prop="phonenumber">

            <el-input  v-model="form.userName" disabled />

          </el-form-item>

        </el-col>

      </el-row>

    </el-form>



    <h4 class="form-header h4">角色信息</h4>

    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">

      <el-table-column label="序号" type="index" align="center">

        <template slot-scope="scope">

          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>

        </template>

      </el-table-column>

      <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>

      <el-table-column label="角色编号" align="center" prop="roleId" />

      <el-table-column label="角色名称" align="center" prop="roleName" />

      <el-table-column label="权限字符" align="center" prop="roleKey" />

      <el-table-column label="创建时间" align="center" prop="createTime" width="180">

        <template slot-scope="scope">

          <span>{{ parseTime(scope.row.createTime) }}</span>

        </template>

      </el-table-column>

    </el-table>

    
    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />



    <el-form label-width="100px">

      <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">

        <el-button type="primary" @click="submitForm()">提交</el-button>

        <el-button @click="close()">返回</el-button>

      </el-form-item>

    </el-form>

  </div>

</template>



<script>

import { getAuthRole, updateAuthRole } from "@/api/system/user";



export default {

  name: "AuthRole",

  data() {

    return {

       // é®ç½©å±‚

      loading: true,

      // åˆ†é¡µä¿¡æ¯

      total: 0,

      pageNum: 1,

      pageSize: 10,

      // é€‰ä¸­è§’色编号

      roleIds:[],

      // è§’色信息

      roles: [],

      // ç”¨æˆ·ä¿¡æ¯

      form: {}

    };

  },

  created() {

    const userId = this.$route.params && this.$route.params.userId;

    if (userId) {

      this.loading = true;

      getAuthRole(userId).then((response) => {

        this.form = response.user;

        this.roles = response.roles;

        this.total = this.roles.length;

        this.$nextTick(() => {

          this.roles.forEach((row) => {

            if (row.flag) {

              this.$refs.table.toggleRowSelection(row);

            }

          });

        });

        this.loading = false;

      });

    }

  },

  methods: {

    /** å•å‡»é€‰ä¸­è¡Œæ•°æ® */

    clickRow(row) {

      this.$refs.table.toggleRowSelection(row);

    },

    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®

    handleSelectionChange(selection) {

      this.roleIds = selection.map((item) => item.roleId);

    },

    // ä¿å­˜é€‰ä¸­çš„数据编号

    getRowKey(row) {

      return row.roleId;

    },

    /** æäº¤æŒ‰é’® */

    submitForm() {

      const userId = this.form.userId;

      const roleIds = this.roleIds.join(",");

      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {

        this.msgSuccess("授权成功");

        this.close();

      });

    },

    /** å…³é—­æŒ‰é’® */

    close() {

      this.$store.dispatch("tagsView/delView", this.$route);

      this.$router.push({ path: "/system/user" });

    },

  },

};

</script>

 ruoyi-ui/src/views/system/user/index.vue

@@ -167,7 +167,7 @@
            width="160"
            class-name="small-padding fixed-width"
          >
            <template slot-scope="scope">
            <template slot-scope="scope" v-if="scope.row.userId !== 1">
              <el-button
                size="mini"
                type="text"
@@ -176,20 +176,23 @@
                v-hasPermi="['system:user:edit']"
              >修改</el-button>
              <el-button
                v-if="scope.row.userId !== 1"
                size="mini"
                type="text"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['system:user:remove']"
              >删除</el-button>
              <el-button
                size="mini"
                type="text"
                icon="el-icon-key"
                @click="handleResetPwd(scope.row)"
                v-hasPermi="['system:user:resetPwd']"
              >重置</el-button>
              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
                <span class="el-dropdown-link">
                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
                </span>
                <el-dropdown-menu slot="dropdown">
                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                </el-dropdown-menu>
              </el-dropdown>
            </template>
          </el-table-column>
        </el-table>
@@ -561,6 +564,19 @@
      this.single = selection.length != 1;
      this.multiple = !selection.length;
    },
    // æ›´å¤šæ“ä½œè§¦å‘
    handleCommand(command, row) {
      switch (command) {
        case "handleResetPwd":
          this.handleResetPwd(row);
          break;
        case "handleAuthRole":
          this.handleAuthRole(row);
          break;
        default:
          break;
      }
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd() {
      this.reset();
@@ -603,6 +619,11 @@
          });
        }).catch(() => {});
    },
    /** åˆ†é…è§’色操作 */
    handleAuthRole: function(row) {
      const userId = row.userId;
      this.$router.push("/auth/role/" + userId);
    },
    /** æäº¤æŒ‰é’® */
    submitForm: function() {
      this.$refs["form"].validate(valid => {