From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java | 12 ++++++++++++
1 files changed, 12 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..47d9ef9 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
@@ -7,8 +7,10 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.system.SystemDataPermissionMapper;
import com.doumee.dao.system.SystemRoleMapper;
import com.doumee.dao.system.dto.QuerySystemRoleDTO;
+import com.doumee.dao.system.model.SystemDataPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.vo.SystemRoleListVO;
import com.doumee.service.system.SystemMenuService;
@@ -41,6 +43,9 @@
@Autowired
private SystemPermissionService systemPermissionService;
+
+ @Autowired
+ private SystemDataPermissionMapper systemDataPermissionMapper;
@Override
public Integer create(SystemRole systemRole) {
@@ -100,6 +105,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);
}
@@ -116,6 +125,9 @@
for (SystemRoleListVO role : roleList) {
role.setMenus(systemMenuService.findByRoleId(role.getId()));
role.setPermissions(systemPermissionService.findByRoleId(role.getId()));
+ role.setSystemDataPermission(systemDataPermissionMapper.selectOne(new QueryWrapper<SystemDataPermission>().lambda()
+ .eq(SystemDataPermission::getDeleted,Constants.ZERO).eq(SystemDataPermission::getRoleId,role.getId()).last("limit 1")
+ ));
}
return PageData.from(new PageInfo<>(roleList));
}
--
Gitblit v1.9.3