bug修改

无关风月

2026-01-08 eb0534912e5dd2fbf65f64e96376af8e65a10c17

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java

@@ -157,11 +157,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 +357,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);