代码优化

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -196,7 +196,10 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:query")
     @GetMapping(value = {"/", "/{userId}"})
     public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
-        userService.checkUserDataScope(userId);
+        SysUserBo sysUserBo = userService.selectById(userId);
+        if (StringUtils.equals(sysUserBo.getUserType(), UserType.SYS_USER.getUserType())) {
+            userService.checkUserDataScope(userId);
+        }
         SysUserInfoVo userInfoVo = new SysUserInfoVo();
         SysRoleBo roleBo = new SysRoleBo();
         roleBo.setStatus(UserConstants.ROLE_NORMAL);
@@ -249,8 +252,11 @@ public class SysUserController extends BaseController {
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysUserBo user) {
         userService.checkUserAllowed(user.getUserId());
-        userService.checkUserDataScope(user.getUserId());
-        deptService.checkDeptDataScope(user.getDeptId());
+        SysUserBo sysUserBo = userService.selectById(user.getUserId());
+        if (StringUtils.equals(sysUserBo.getUserType(), UserType.SYS_USER.getUserType())) {
+            userService.checkUserDataScope(user.getUserId());
+            deptService.checkDeptDataScope(user.getDeptId());
+        }
         if (!userService.checkUserNameUnique(user)) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {