update

liujie

2026-07-02 cfb6d6a8bc21bfce63fb1a9158fb394428c4510e

 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);