From f605b84620bf35bb02a2ee5ef2086c164b520e67 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 16 一月 2026 16:16:36 +0800
Subject: [PATCH] 浪潮对接单点登录:MES制造执行系统功能迁移
---
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 91 ++++++++++++++++++++++++++++-----------------
1 files changed, 56 insertions(+), 35 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 16794a3..fead819 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;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
@@ -112,7 +114,12 @@
}
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());
+// ajax.put("posts", postService.selectPostAll());
+ ajax.put("posts", postService.selectPostByTenantId(SecurityUtils.getLoginUser().getTenantId()));
+ 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,21 +131,21 @@
@PostMapping
public AjaxResult add(@Validated @RequestBody SysUser user)
{
- deptService.checkDeptDataScope(user.getDeptId());
- roleService.checkRoleDataScope(user.getRoleIds());
- if (!userService.checkUserNameUnique(user))
- {
- return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
- {
- return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
- {
- return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
- }
+// roleService.checkRoleDataScope(user.getRoleIds());
+// if (!userService.checkUserNameUnique(user))
+// {
+// return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+// }
+// else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+// {
+// return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+// }
+// else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+// {
+// return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+// }
user.setCreateBy(getUsername());
+ user.setTenantId(SecurityUtils.getLoginUser().getTenantId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user));
}
@@ -151,23 +158,23 @@
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysUser user)
{
- userService.checkUserAllowed(user);
- userService.checkUserDataScope(user.getUserId());
- deptService.checkDeptDataScope(user.getDeptId());
- roleService.checkRoleDataScope(user.getRoleIds());
- if (!userService.checkUserNameUnique(user))
- {
- return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
- {
- return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
- {
- return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
- }
+// userService.checkUserAllowed(user);
+// userService.checkUserDataScope(user.getUserId());
+// roleService.checkRoleDataScope(user.getRoleIds());
+// if (!userService.checkUserNameUnique(user))
+// {
+// return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+// }
+// else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+// {
+// return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+// }
+// else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+// {
+// return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+// }
user.setUpdateBy(getUsername());
+ userService.bindUserDept(user);
return toAjax(userService.updateUser(user));
}
@@ -264,4 +271,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);
+ }
}
--
Gitblit v1.9.3