From 549bad4e3b36337dc9d3b436efba0103cc0761ff Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 15 五月 2026 11:50:34 +0800
Subject: [PATCH] 班组长或者指定班组成员能看到对应数据
---
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 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 aa787ed..5e3e60b 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/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;
@@ -33,26 +35,18 @@
/**
* 鐢ㄦ埛淇℃伅
- *
+ *
* @author ruoyi
*/
@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,28 @@
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);
+ }
+
+ /**
+ * 鏌ヨ瑙掕壊涓簍eamLeader鐨勭敤鎴峰垪琛�
+ * @return
+ */
+ @GetMapping("/teamLeaderList")
+ public AjaxResult selectTeamLeaderUserList(){
+ List<SysUser> sysUserList = userService.selectTeamLeaderUserList();
+ return AjaxResult.success(sysUserList);
+ }
}
--
Gitblit v1.9.3