Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-23 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2

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

@@ -2,10 +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;

@@ -38,21 +40,13 @@
 */

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



    @Autowired

    private ISysUserDeptService userDeptService;



    /**

@@ -65,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)

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

        user.setCreateBy(getUsername());

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

        user.setTenantId(user.getDeptId());

        return toAjax(userService.insertUser(user));

    }



@@ -269,4 +275,18 @@
        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);

    }

}