From 5a7297f4b57b40801b0cf0247a42e883d3c986bb Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 22 十月 2025 14:12:28 +0800
Subject: [PATCH] yys  发货台账管理

---
 src/main/java/com/ruoyi/project/system/controller/SysUserController.java |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 19c100e..14618a9 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -3,6 +3,9 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.service.*;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,10 +30,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;
 
 /**
  * 鐢ㄦ埛淇℃伅
@@ -52,6 +51,9 @@
 
     @Autowired
     private ISysPostService postService;
+
+    @Autowired
+    private ISysUserDeptService userDeptService;
 
     /**
      * 鑾峰彇鐢ㄦ埛鍒楄〃
@@ -101,18 +103,22 @@
     @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))
         {
+            userService.checkUserDataScope(userId);
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
+        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,6 +130,7 @@
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user)
     {
+        roleService.checkRoleDataScope(user.getRoleIds());
         if (!userService.checkUserNameUnique(user))
         {
             return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
@@ -151,6 +158,7 @@
     {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
+        roleService.checkRoleDataScope(user.getRoleIds());
         if (!userService.checkUserNameUnique(user))
         {
             return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
@@ -164,6 +172,7 @@
             return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
         }
         user.setUpdateBy(getUsername());
+        userService.bindUserDept(user);
         return toAjax(userService.updateUser(user));
     }
 
@@ -235,6 +244,7 @@
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
     {
         userService.checkUserDataScope(userId);
+        roleService.checkRoleDataScope(roleIds);
         userService.insertUserAuth(userId, roleIds);
         return success();
     }
@@ -248,4 +258,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);
+    }
 }

--
Gitblit v1.9.3