From be0301e67768fb183df7e29f411a7e54dbf15c40 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 10:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
index 201129c..7dcaaf7 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
@@ -100,6 +100,10 @@
@Override
public List<SystemRole> findList(SystemRole systemRole) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(Objects.nonNull(user)&&(user.getType().equals(Constants.ONE)||user.getType().equals(Constants.TWO))){
+ systemRole.setCompanyId(user.getCompanyId());
+ }
Wrapper<SystemRole> wrapper = new QueryWrapper<>(systemRole);
return systemRoleMapper.selectList(wrapper);
}
--
Gitblit v1.9.3