用户修改减少一次角色列表关联查询

RuoYi

2022-01-01 4eeb8ec1934dd5c7bfa6da6c3c5c611040fc3549

 src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -2,6 +2,7 @@


import java.util.List;

import java.util.stream.Collectors;

import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.ArrayUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

@@ -62,12 +63,12 @@


    @Log(title = "用户管理", businessType = BusinessType.EXPORT)

    @PreAuthorize("@ss.hasPermi('system:user:export')")

    @GetMapping("/export")

    public AjaxResult export(SysUser user)

    @PostMapping("/export")

    public void export(HttpServletResponse response, SysUser user)

    {

        List<SysUser> list = userService.selectUserList(user);

        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);

        return util.exportExcel(list, "用户数据");

        util.exportExcel(response, list, "用户数据");

    }



    @Log(title = "用户管理", businessType = BusinessType.IMPORT)

@@ -82,11 +83,11 @@
        return AjaxResult.success(message);

    }



    @GetMapping("/importTemplate")

    public AjaxResult importTemplate()

    @PostMapping("/importTemplate")

    public void importTemplate(HttpServletResponse response)

    {

        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);

        return util.importTemplateExcel("用户数据");

        util.importTemplateExcel(response, "用户数据");

    }



    /**

@@ -96,15 +97,17 @@
    @GetMapping(value = { "/", "/{userId}" })

    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)

    {

        userService.checkUserDataScope(userId);

        AjaxResult ajax = AjaxResult.success();

        List<SysRole> roles = roleService.selectRoleAll();

        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));

        ajax.put("posts", postService.selectPostAll());

        if (StringUtils.isNotNull(userId))

        {

            SysUser sysUser = userService.selectUserById(userId);

            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));

            ajax.put("postIds", postService.selectPostListByUserId(userId));

            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));

            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));

        }

        return ajax;

    }