From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java | 8 ++++++++
1 files changed, 8 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 7dcaaf7..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) {
@@ -120,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