From cfb6d6a8bc21bfce63fb1a9158fb394428c4510e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 02 七月 2026 16:18:07 +0800
Subject: [PATCH] update
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index 619eaba..d20430b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -126,11 +126,21 @@
}
assertAuth(userId);
User user = this.userService.getById(userId);
- Role role = roleService.getById(user.getId());
+ Role role = roleService.getById(user.getRoleid());
Dept dept = deptService.getById(user.getDeptid());
model.addAttribute(user);
- model.addAttribute("roleName", role.getName());
- model.addAttribute("deptName", dept.getFullname());
+ if(role==null){
+ model.addAttribute("roleName", "");
+ }else {
+ model.addAttribute("roleName", role.getName());
+ }
+ if(dept==null){
+
+ model.addAttribute("deptName","");
+ }else {
+
+ model.addAttribute("deptName", dept.getFullname());
+ }
LogObjectHolder.me().set(user);
LambdaQueryWrapper<Role> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(UserExt.getUser().getObjectType()!=1){
@@ -157,11 +167,16 @@
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
User user = this.userService.getById(userId);
- Role role = roleService.getById(user.getId());
+ Role role = roleService.getById(user.getRoleid());
Dept dept = deptService.getById(user.getDeptid());
model.addAttribute(user);
model.addAttribute("roleName", role.getName());
- model.addAttribute("deptName", user.getDeptid()==0?"顶级":dept.getFullname());
+ if(dept==null){
+ model.addAttribute("deptName", "无");
+ }else{
+ model.addAttribute("deptName", user.getDeptid()==0?"顶级":dept.getFullname());
+
+ }
LogObjectHolder.me().set(user);
return PREFIX + "user_view.html";
}
@@ -352,10 +367,10 @@
}
oldUser.setName(user.getName());
oldUser.setBirthday(user.getBirthday());
- oldUser.setRoleid(user.getRoleid());
oldUser.setDeptid(user.getDeptid());
oldUser.setIdCard(user.getIdCard());
oldUser.setSex(user.getSex());
+ oldUser.setEmail(user.getEmail());
if (user.getAvatar()!=null && (!user.getAvatar().equals("")))
oldUser.setAvatar(user.getAvatar());
this.userService.updateById(oldUser);
--
Gitblit v1.7.1