From 1ee5043af9ee5e53acb52a70fd93c4656e8bbb44 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 11:59:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 d699be8..94318e0 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
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
import com.doumee.dao.system.SystemRoleMapper;
import com.doumee.dao.system.dto.QuerySystemRoleDTO;
import com.doumee.dao.system.model.SystemRole;
@@ -13,12 +15,14 @@
import com.doumee.service.system.SystemRoleService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 绯荤粺瑙掕壊Service瀹炵幇
@@ -95,11 +99,15 @@
Wrapper<SystemRole> wrapper = new QueryWrapper<>(systemRole);
return systemRoleMapper.selectList(wrapper);
}
-
+
@Override
public PageData<SystemRoleListVO> findPage(PageWrap<QuerySystemRoleDTO> pageWrap) {
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ QuerySystemRoleDTO model = pageWrap.getModel();
+ model.setType(Objects.nonNull(model.getType()) ? model.getType() : principal.getType());
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
- List<SystemRoleListVO> roleList = systemRoleMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
+ List<SystemRoleListVO> roleList = systemRoleMapper.selectManageList(model, pageWrap.getOrderByClause());
for (SystemRoleListVO role : roleList) {
role.setMenus(systemMenuService.findByRoleId(role.getId()));
role.setPermissions(systemPermissionService.findByRoleId(role.getId()));
--
Gitblit v1.9.3