浪潮对接单点登录:MES制造执行系统功能迁移

zouyu

2026-01-16 f605b84620bf35bb02a2ee5ef2086c164b520e67

 src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -114,7 +114,8 @@
        }

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

@@ -130,20 +131,21 @@
    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysUser user)

    {

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

    }

@@ -156,21 +158,21 @@
    @PutMapping

    public AjaxResult edit(@Validated @RequestBody SysUser user)

    {

        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() + "'失败，邮箱账号已存在");

        }

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