修复多参数逗号分隔的问题

RuoYi

2021-12-14 eb5df8834bfdcb3b9601efa798c461c5a0f62b99

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -19,7 +19,6 @@
import org.springframework.web.multipart.MultipartFile;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.domain.R;

import com.ruoyi.common.core.utils.SecurityUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.poi.ExcelUtil;

import com.ruoyi.common.core.web.controller.BaseController;

@@ -28,7 +27,8 @@
import com.ruoyi.common.log.annotation.Log;

import com.ruoyi.common.log.enums.BusinessType;

import com.ruoyi.common.security.annotation.InnerAuth;

import com.ruoyi.common.security.annotation.PreAuthorize;

import com.ruoyi.common.security.annotation.RequiresPermissions;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.system.api.domain.SysRole;

import com.ruoyi.system.api.domain.SysUser;

import com.ruoyi.system.api.model.LoginUser;

@@ -65,7 +65,7 @@
    /**

     * 获取用户列表

     */

    @PreAuthorize(hasPermi = "system:user:list")

    @RequiresPermissions("system:user:list")

    @GetMapping("/list")

    public TableDataInfo list(SysUser user)

    {

@@ -75,9 +75,9 @@
    }



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

    @PreAuthorize(hasPermi = "system:user:export")

    @RequiresPermissions("system:user:export")

    @PostMapping("/export")

    public void export(HttpServletResponse response, SysUser user) throws IOException

    public void export(HttpServletResponse response, SysUser user)

    {

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

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

@@ -85,7 +85,7 @@
    }



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

    @PreAuthorize(hasPermi = "system:user:import")

    @RequiresPermissions("system:user:import")

    @PostMapping("/importData")

    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception

    {

@@ -168,10 +168,11 @@
    /**

     * 根据用户编号获取详细信息

     */

    @PreAuthorize(hasPermi = "system:user:query")

    @RequiresPermissions("system:user:query")

    @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()));

@@ -188,7 +189,7 @@
    /**

     * 新增用户

     */

    @PreAuthorize(hasPermi = "system:user:add")

    @RequiresPermissions("system:user:add")

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

    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysUser user)

@@ -215,7 +216,7 @@
    /**

     * 修改用户

     */

    @PreAuthorize(hasPermi = "system:user:edit")

    @RequiresPermissions("system:user:edit")

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

    @PutMapping

    public AjaxResult edit(@Validated @RequestBody SysUser user)

@@ -238,7 +239,7 @@
    /**

     * 删除用户

     */

    @PreAuthorize(hasPermi = "system:user:remove")

    @RequiresPermissions("system:user:remove")

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

    @DeleteMapping("/{userIds}")

    public AjaxResult remove(@PathVariable Long[] userIds)

@@ -253,7 +254,7 @@
    /**

     * 重置密码

     */

    @PreAuthorize(hasPermi = "system:user:edit")

    @RequiresPermissions("system:user:edit")

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

    @PutMapping("/resetPwd")

    public AjaxResult resetPwd(@RequestBody SysUser user)

@@ -267,7 +268,7 @@
    /**

     * 状态修改

     */

    @PreAuthorize(hasPermi = "system:user:edit")

    @RequiresPermissions("system:user:edit")

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

    @PutMapping("/changeStatus")

    public AjaxResult changeStatus(@RequestBody SysUser user)

@@ -280,7 +281,7 @@
    /**

     * 根据用户编号获取授权角色

     */

    @PreAuthorize(hasPermi = "system:user:query")

    @RequiresPermissions("system:user:query")

    @GetMapping("/authRole/{userId}")

    public AjaxResult authRole(@PathVariable("userId") Long userId)

    {

@@ -295,7 +296,7 @@
    /**

     * 用户授权角色

     */

    @PreAuthorize(hasPermi = "system:user:edit")

    @RequiresPermissions("system:user:edit")

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

    @PutMapping("/authRole")

    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)