diff --git a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/UserConstants.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/UserConstants.java index db3c185..026e2dd 100644 --- a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/UserConstants.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/UserConstants.java @@ -137,6 +137,6 @@ public interface UserConstants { /** * 管理员ID */ - Long ADMIN_ID = 1L; + Long SUPER_ADMIN_ID = 1L; } diff --git a/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/PlusDataPermissionHandler.java index 9c86a50..740962b 100644 --- a/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/PlusDataPermissionHandler.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/PlusDataPermissionHandler.java @@ -68,7 +68,7 @@ public class PlusDataPermissionHandler { DataPermissionHelper.setVariable("user", currentUser); } // 如果是超级管理员，则不过滤数据 - if (LoginHelper.isAdmin()) { + if (LoginHelper.isSuperAdmin()) { return where; } String dataFilterSql = buildDataFilter(dataColumns, isSelect); diff --git a/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/utils/LoginHelper.java b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/utils/LoginHelper.java index c33e4dc..d46b3e1 100644 --- a/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/utils/LoginHelper.java +++ b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/utils/LoginHelper.java @@ -185,12 +185,13 @@ public class LoginHelper { * @param userId 用户ID * @return 结果 */ - public static boolean isAdmin(Long userId) { - return UserConstants.ADMIN_ID.equals(userId); + public static boolean isSuperAdmin(Long userId) { + return UserConstants.SUPER_ADMIN_ID.equals(userId); } - public static boolean isAdmin() { - return isAdmin(getUserId()); + + public static boolean isSuperAdmin() { + return isSuperAdmin(getUserId()); } } diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/filter/TenantFilter.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/filter/TenantFilter.java index bc84ae4..67315f7 100644 --- a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/filter/TenantFilter.java +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/filter/TenantFilter.java @@ -47,34 +47,26 @@ public class TenantFilter implements Filter { } String tenantHeader = request.getHeader(TENANT_ID_HEADER); boolean login = TenantHelper.isLogin(); - if(login){ + if(login){ // 已经登录 + String tenantId = LoginHelper.getTenantId(); + if("/getInfo".equals(requestURI)){ // 特殊放权接口 + TenantHelper.setTenantId(tenantId); + filterChain.doFilter(servletRequest, servletResponse); + return; + } Long userId = LoginHelper.getUserId(); - if(TenantConstants.SUPER_ADMIN_ID.equals(userId)){ + if(TenantConstants.SUPER_ADMIN_ID.equals(userId)){ // 超管前端给什么用什么 TenantHelper.setTenantId(tenantHeader); filterChain.doFilter(servletRequest, servletResponse); return; } - } - if(!StringUtils.isBlank(tenantHeader)){ - if(login){ - String tenantId = LoginHelper.getTenantId(); - if(tenantId == null || !tenantId.equals(tenantHeader)){ - ServletUtils.renderString(response, JSONUtil.toJsonStr(R.fail("平台错误"))); - return; - } - TenantHelper.setTenantId(tenantId); - }else{ - TenantHelper.setTenantId(tenantHeader); - } - } else { - if(login){ - String tenantId = LoginHelper.getTenantId(); - if(tenantId == null){ - ServletUtils.renderString(response, JSONUtil.toJsonStr(R.fail("平台错误"))); - return; - } - TenantHelper.setTenantId(tenantId); + if(tenantId == null || !tenantId.equals(tenantHeader)){ // 非超管 如果当前用户和前端给的不支持 返回异常 + ServletUtils.renderString(response, JSONUtil.toJsonStr(R.fail("平台错误"))); + return; } + TenantHelper.setTenantId(tenantId); + }else{ + TenantHelper.setTenantId(tenantHeader); } filterChain.doFilter(servletRequest, servletResponse); } finally { diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/AgreementSetting.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/AgreementSetting.java index 4bff461..ef204c4 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/AgreementSetting.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/AgreementSetting.java @@ -49,6 +49,8 @@ public class AgreementSetting implements Serializable { private String contractTemplate; + private String tenantId; + @TableField(exist = false) private static final long serialVersionUID = 1L; } diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/Borrow.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/Borrow.java index f255c50..ef1953e 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/Borrow.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/Borrow.java @@ -207,4 +207,6 @@ public class Borrow implements Serializable { @Schema(description = "修改时间") private LocalDateTime updateTime; + private String tenantId; + } diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/BorrowLog.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/BorrowLog.java index 80a1254..a1d9f64 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/BorrowLog.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/BorrowLog.java @@ -17,5 +17,5 @@ public class BorrowLog { private Long id; private Double withdrawAccount; private Long customerId; - + private String tenantId; } diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/BorrowStatus.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/BorrowStatus.java index f259e74..4cc7bcb 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/BorrowStatus.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/BorrowStatus.java @@ -64,4 +64,6 @@ public class BorrowStatus implements Serializable { @Schema(description = "修改时间") private Date updateTime; + private String tenantId; + } diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/Customer.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/Customer.java index 43054c9..81682e9 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/Customer.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/Customer.java @@ -95,6 +95,8 @@ public class Customer implements Serializable { @Schema(description = "修改时间") private LocalDateTime updateTime; + private String tenantId; + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/CustomerInfo.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/CustomerInfo.java index 823d9a7..aa84644 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/CustomerInfo.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/CustomerInfo.java @@ -154,6 +154,8 @@ public class CustomerInfo implements Serializable { @Schema(description = "签名") private String signature; + private String tenantId; + private Boolean allowSignature = true; @TableField(exist = false) diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/HomeSetting.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/HomeSetting.java index a92b26b..41e03b3 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/HomeSetting.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/HomeSetting.java @@ -43,6 +43,7 @@ public class HomeSetting implements Serializable { private Boolean openWithdrawCode; private String defaultCoinUnit; private String randomPhoneVersion; + private String tenantId; @TableField(exist = false) private static final long serialVersionUID = 1L; } diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/LoansSetting.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/LoansSetting.java index 9f1875e..cf2eb75 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/LoansSetting.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/domain/LoansSetting.java @@ -56,6 +56,8 @@ public class LoansSetting implements Serializable { */ private String serviceRate; + private String tenantId; + @TableField(exist = false) private static final long serialVersionUID = 1L; } diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/kit/DkLoginKit.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/kit/DkLoginKit.java index e816423..842a848 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/kit/DkLoginKit.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/kit/DkLoginKit.java @@ -2,6 +2,7 @@ package com.ruoyi.dk.kit; import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.stp.StpUtil; +import com.ruoyi.component.tenant.helper.TenantHelper; import com.ruoyi.dk.domain.Customer; import com.ruoyi.dk.executor.ExecutorConstant; import com.ruoyi.dk.service.CustomerService; @@ -67,7 +68,7 @@ public class DkLoginKit { loginUser.setRoleId(null); loginUser.setUserId(user.getId()); loginUser.setUserType(UserType.APP_USER.getUserType()); -// loginUser.setTenantId(user); + loginUser.setTenantId(user.getTenantId()); LoginHelper.login(loginUser); sysLoginService.recordLogininfor(loginUser.getUsername(), UserType.APP_USER.getUserType(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); return StpUtil.getTokenValue(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginController.java index 23777ae..1054334 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginController.java @@ -157,7 +157,7 @@ public class SysLoginController { return R.ok(tenantList); }else { SysTenantBo sysTenantBo = new SysTenantBo(); - sysTenantBo.setTenantId(TenantHelper.getTenantId()); + sysTenantBo.setTenantId(LoginHelper.getTenantId()); List tenantList = tenantService.queryList(sysTenantBo); return R.ok(tenantList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index f777a4b..5d5799f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -123,7 +123,7 @@ public class SysUserController extends BaseController { SysPost post = new SysPost(); post.setStatus(UserConstants.POST_NORMAL); List roles = roleService.selectRoleList(role); - ajax.put("roles", LoginHelper.isAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isAdmin())); + ajax.put("roles", LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isAdmin())); ajax.put("posts", postService.selectPostList(post)); if (ObjectUtil.isNotNull(userId)) { SysUser sysUser = userService.selectUserById(userId); @@ -225,7 +225,7 @@ public class SysUserController extends BaseController { List roles = roleService.selectRolesByUserId(userId); Map ajax = new HashMap<>(); ajax.put("user", user); - ajax.put("roles", LoginHelper.isAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isAdmin())); + ajax.put("roles", LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isAdmin())); return R.ok(ajax); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java index b9cccf7..bb20d7b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java @@ -120,6 +120,6 @@ public class SysRole extends TenantEntity { } public boolean isAdmin() { - return UserConstants.ADMIN_ID.equals(this.roleId); + return UserConstants.SUPER_ADMIN_ID.equals(this.roleId); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java index 82eb5d8..2dbbabe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java @@ -164,7 +164,7 @@ public class SysUser extends TenantEntity { } public boolean isAdmin() { - return UserConstants.ADMIN_ID.equals(this.userId); + return UserConstants.SUPER_ADMIN_ID.equals(this.userId); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java index 632fcdf..c51dab1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -1,8 +1,10 @@ package com.ruoyi.system.service; +import com.ruoyi.component.log.event.LogininforEvent; import com.ruoyi.component.mybatis.core.page.PageQuery; import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysLogininfor; +import org.springframework.context.event.EventListener; import java.util.List; @@ -14,6 +16,9 @@ import java.util.List; public interface ISysLogininforService { + @EventListener + void recordLogininfor(LogininforEvent logininforEvent); + TableDataInfo selectPageLogininforList(SysLogininfor logininfor, PageQuery pageQuery); /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java index 7828b7e..8c70938 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java @@ -10,6 +10,7 @@ import com.ruoyi.component.core.constant.CacheConstants; import com.ruoyi.component.core.constant.Constants; import com.ruoyi.component.core.constant.GlobalConstants; import com.ruoyi.component.core.domain.dto.RoleDTO; +import com.ruoyi.component.core.executor.ExecutorConstant; import com.ruoyi.component.log.event.LogininforEvent; import com.ruoyi.component.redis.util.RedisUtils; import com.ruoyi.component.tenant.core.TenantEntity; @@ -33,6 +34,7 @@ import com.ruoyi.component.core.util.spring.SpringUtils; import com.ruoyi.system.mapper.SysUserMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -157,6 +159,9 @@ public class SysLoginService { } } + @Autowired + private ISysLogininforService sysLogininforService; + /** * 记录登录信息 * @@ -171,7 +176,9 @@ public class SysLoginService { logininforEvent.setStatus(status); logininforEvent.setMessage(message); logininforEvent.setRequest(ServletUtils.getRequest()); - SpringUtils.context().publishEvent(logininforEvent); + ExecutorConstant.COMMON_EXECUTOR.execute(() -> { + sysLogininforService.recordLogininfor(logininforEvent); + }); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java index 74dabec..8b1bd83 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.secure.BCrypt; import com.ruoyi.component.core.constant.CacheConstants; import com.ruoyi.component.core.constant.Constants; import com.ruoyi.component.core.constant.GlobalConstants; +import com.ruoyi.component.core.executor.ExecutorConstant; import com.ruoyi.component.log.event.LogininforEvent; import com.ruoyi.component.redis.util.RedisUtils; import com.ruoyi.system.domain.SysUser; @@ -30,6 +31,7 @@ public class SysRegisterService { private final ISysUserService userService; private final ISysConfigService configService; + private final ISysLogininforService sysLogininforService; /** * 注册 @@ -96,7 +98,9 @@ public class SysRegisterService { logininforEvent.setStatus(status); logininforEvent.setMessage(message); logininforEvent.setRequest(ServletUtils.getRequest()); - SpringUtils.context().publishEvent(logininforEvent); + ExecutorConstant.COMMON_EXECUTOR.execute(() -> { + sysLogininforService.recordLogininfor(logininforEvent); + }); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 91df2bb..7b82ccf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -204,7 +204,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { */ @Override public void checkDeptDataScope(Long deptId) { - if (!LoginHelper.isAdmin()) { + if (!LoginHelper.isSuperAdmin()) { SysDept dept = new SysDept(); dept.setDeptId(deptId); List depts = this.selectDeptList(dept); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 6ad5847..352aecc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -17,7 +17,6 @@ import com.ruoyi.system.service.ISysLogininforService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -43,8 +42,8 @@ public class SysLogininforServiceImpl implements ISysLogininforService { * * @param logininforEvent 登录事件 */ - @Async @EventListener + @Override public void recordLogininfor(LogininforEvent logininforEvent) { HttpServletRequest request = logininforEvent.getRequest(); final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent")); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index b215a24..91d898d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -64,7 +64,7 @@ public class SysMenuServiceImpl implements ISysMenuService { public List selectMenuList(SysMenu menu, Long userId) { List menuList = null; // 管理员显示所有菜单信息 - if (LoginHelper.isAdmin(userId)) { + if (LoginHelper.isSuperAdmin(userId)) { menuList = baseMapper.selectList(new LambdaQueryWrapper() .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName()) .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible()) @@ -129,7 +129,7 @@ public class SysMenuServiceImpl implements ISysMenuService { @Override public List selectMenuTreeByUserId(Long userId) { List menus = null; - if (LoginHelper.isAdmin(userId)) { + if (LoginHelper.isSuperAdmin(userId)) { menus = baseMapper.selectMenuTreeAll(); } else { menus = baseMapper.selectMenuTreeByUserId(userId); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index eb896b0..a3579e1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -214,7 +214,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public void checkRoleDataScope(Long roleId) { - if (!LoginHelper.isAdmin()) { + if (!LoginHelper.isSuperAdmin()) { SysRole role = new SysRole(); role.setRoleId(roleId); List roles = this.selectRoleList(role); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java index 2730a25..5dd56ea 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java @@ -27,7 +27,7 @@ public class SysSensitiveServiceImpl implements SensitiveService { */ @Override public boolean isSensitive() { - if(LoginHelper.isAdmin()){ + if(LoginHelper.isSuperAdmin()){ return false; } return SENSITIVE; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index ab5b209..47ef723 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -251,7 +251,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override public void checkUserDataScope(Long userId) { - if (!LoginHelper.isAdmin()) { + if (!LoginHelper.isSuperAdmin()) { SysUser user = new SysUser(); user.setUserId(userId); List users = this.selectUserList(user);