Merge remote-tracking branch 'origin/main'

God-Vue-master/god-system/src/main/java/com/god/system/service/impl/SysUserServiceImpl.java

@@ -236,7 +236,7 @@ public class SysUserServiceImpl implements ISysUserService {
     public void checkUserDataScope(SysUser user) {
         if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
 //            SysUser user = new SysUser();
-//            user.setUserId(userId);
+//            user.setUserId(SecurityUtils.getUserId());
             List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
             if (StringUtils.isEmpty(users)) {
                 throw new ServiceException("没有权限访问用户数据！");