配置文件上传

chenhj

2026-04-25 68f0d9a4cce457e9623e55b14858f7e5ea4c4622

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

@@ -2,7 +2,12 @@


import java.util.List;

import java.util.stream.Collectors;

import javax.servlet.http.HttpServletResponse;

import jakarta.servlet.http.HttpServletResponse;



import com.ruoyi.project.system.domain.vo.SysUserDeptVo;

import com.ruoyi.project.system.mapper.SysUserMapper;

import com.ruoyi.project.system.service.*;

import lombok.AllArgsConstructor;

import org.apache.commons.lang3.ArrayUtils;

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

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

@@ -27,10 +32,6 @@
import com.ruoyi.project.system.domain.SysDept;

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

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

import com.ruoyi.project.system.service.ISysDeptService;

import com.ruoyi.project.system.service.ISysPostService;

import com.ruoyi.project.system.service.ISysRoleService;

import com.ruoyi.project.system.service.ISysUserService;



/**

 * 用户信息

@@ -39,19 +40,14 @@
 */

@RestController

@RequestMapping("/system/user")

@AllArgsConstructor

public class SysUserController extends BaseController

{

    @Autowired

    private ISysUserService userService;



    @Autowired

    private ISysRoleService roleService;



    @Autowired

    private ISysDeptService deptService;



    @Autowired

    private ISysPostService postService;

    private ISysUserDeptService userDeptService;



    /**

     * 获取用户列表

@@ -63,6 +59,17 @@
        startPage();

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

        return getDataTable(list);

    }



    /**

     * 获取用户列表

     */

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

    @GetMapping("/listAll")

    public AjaxResult listAll(SysUser user)

    {

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

        return AjaxResult.success(list);

    }



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

@@ -113,6 +120,10 @@
        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());

        SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();

        sysUserDeptVo.setUserId(userId);

        List<SysUserDeptVo> sysUserDeptVos = userDeptService.userLoginFacotryList(sysUserDeptVo);

        ajax.put("deptIds",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()));

        return ajax;

    }



@@ -124,7 +135,6 @@
    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysUser user)

    {

        deptService.checkDeptDataScope(user.getDeptId());

        roleService.checkRoleDataScope(user.getRoleIds());

        if (!userService.checkUserNameUnique(user))

        {

@@ -140,6 +150,7 @@
        }

        user.setCreateBy(getUsername());

        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));

        user.setTenantId(user.getDeptId());

        return toAjax(userService.insertUser(user));

    }



@@ -153,7 +164,6 @@
    {

        userService.checkUserAllowed(user);

        userService.checkUserDataScope(user.getUserId());

        deptService.checkDeptDataScope(user.getDeptId());

        roleService.checkRoleDataScope(user.getRoleIds());

        if (!userService.checkUserNameUnique(user))

        {

@@ -168,6 +178,7 @@
            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");

        }

        user.setUpdateBy(getUsername());

        userService.bindUserDept(user);

        return toAjax(userService.updateUser(user));

    }



@@ -253,4 +264,29 @@
    {

        return success(deptService.selectDeptTreeList(dept));

    }



    /**

     * 不分页用户查询

     * @param user

     * @return

     */

    @GetMapping("/userListNoPage")

    public AjaxResult userListNoPage(SysUser user){

        List<SysUser> sysUserList = userService.userListNoPage(user);

        return AjaxResult.success(sysUserList);

    }



    /**

     * 查询当前用户公司下所有用户

     * @param user

     * @return

     */

    @GetMapping("/userListNoPageByTenantId")

    public AjaxResult userListNoPageByTenantId(SysUser user){

        //获取登录用户信息

        SysUser loginUser = SecurityUtils.getLoginUser().getUser();

        user.setTenantId(loginUser.getTenantId());

        List<SysUser> sysUserList = userService.userListNoPage(user);

        return AjaxResult.success(sysUserList);

    }

}