From 7fa0a141a3c88ca90c67c966260bf26f03f255da Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 07 Jun 2022 16:00:09 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java
index 8411b92..aca6db1 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java
@@ -15,6 +15,7 @@
import com.xcong.farmer.cms.modules.system.entity.*;
import com.xcong.farmer.cms.modules.system.mapper.*;
import com.xcong.farmer.cms.modules.system.service.IRoleService;
+import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.AdminMenuInfoVo;
import com.xcong.farmer.cms.modules.system.vo.AdminRoleVo;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeRoleInfoVo;
@@ -46,10 +47,15 @@
@Override
public Result getRoleInPage(AdminRoleDto adminRoleDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
Page<AdminRoleVo> page = new Page<>(adminRoleDto.getPageNum(), adminRoleDto.getPageSize());
RoleEntity roleEntity = new RoleEntity();
+ Long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
if(StrUtil.isNotEmpty(adminRoleDto.getRoleName())){
roleEntity.setRoleName(adminRoleDto.getRoleName());
+ }
+ if(belongId > 0L){
+ roleEntity.setBelongId(belongId);
}
IPage<AdminRoleVo> list = this.baseMapper.selectAdminRoleVoInPage(page,roleEntity);
return Result.ok(list);
@@ -58,6 +64,7 @@
@Override
@Transactional
public Result addRole(AdminAddRoleDto adminAddRoleDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
String roleName = adminAddRoleDto.getRoleName();
if(StrUtil.isEmpty(roleName)){
return Result.fail("请输入角色名称");
@@ -72,6 +79,7 @@
roleEntity.setRemark(remark);
}
roleEntity.setRoleName(roleName);
+ roleEntity.setBelongId(userlogin.getBelongId() == null?0L:userlogin.getBelongId());
int insert = this.baseMapper.insert(roleEntity);
if(insert > 0){
saveRoleMenus(menuIds,roleEntity.getId());
--
Gitblit v1.9.1