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/resources/mappers/SystemMenuMapper.xml | 2 +-
server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java | 12 ++++++++++--
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 1 +
server/service/src/main/resources/mappers/SystemRoleMapper.xml | 2 +-
server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java | 4 ++++
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
index a81ad34..8886dac 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
@@ -5,8 +5,10 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateRoleMenuDTO;
import com.doumee.dao.system.dto.CreateRolePermissionDTO;
import com.doumee.dao.system.dto.QuerySystemRoleDTO;
@@ -104,7 +106,9 @@
@GetMapping("/all")
@RequiresPermissions("system:role:query")
public ApiResponse<List<SystemRole>> findAll () {
+ LoginUserInfo loginUser = getLoginUser();
SystemRole systemRole = new SystemRole();
+ systemRole.setType(loginUser.getType());
systemRole.setDeleted(Boolean.FALSE);
return ApiResponse.success(systemRoleService.findList(systemRole));
}
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index e323532..446eac4 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -112,6 +112,7 @@
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(systemUser.getUsername());
queryUserDto.setDeleted(Boolean.FALSE);
+ queryUserDto.setType(Constants.ZERO);
SystemUser user = systemUserService.findOne(queryUserDto);
if (user != null) {
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐧诲綍璐﹀彿宸插瓨鍦�");
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()));
diff --git a/server/service/src/main/resources/mappers/SystemMenuMapper.xml b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
index 104ed0c..f270a4d 100644
--- a/server/service/src/main/resources/mappers/SystemMenuMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
@@ -20,7 +20,7 @@
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
FROM SYSTEM_MENU menu
- JOIN `SYSTEM_USER` create_user ON create_user.ID = menu.CREATE_USER
+ LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = menu.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = menu.UPDATE_USER
<where>
menu.DELETED = 0 and menu.type = #{type}
diff --git a/server/service/src/main/resources/mappers/SystemRoleMapper.xml b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
index 7c35d77..406267c 100644
--- a/server/service/src/main/resources/mappers/SystemRoleMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
@@ -30,7 +30,7 @@
<if test="dto.name != null and dto.name != ''">
AND role.`NAME` LIKE CONCAT('%', #{dto.name}, '%')
</if>
- <if test="dto.type != null and dto.type != ''">
+ <if test="dto.type != null">
AND role.type = #{dto.type}
</if>
</where>
--
Gitblit v1.9.3