From 752c36b6dab9b0483ebc9cb356cb1a09d45bd578 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 17 三月 2023 17:53:49 +0800
Subject: [PATCH] 增加租户管理字段，更新租户管理部分代码
---
Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
index bcb74b6..92257e4 100644
--- a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
+++ b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
@@ -116,8 +116,8 @@
List<String> codes = tenants.stream().map(Tenant::getTenantId).collect(Collectors.toList());
String tenantId = getTenantId(codes);
tenant.setTenantId(tenantId);
- // 閰嶇疆涓篺alse锛屽苟涓斿墠绔紶杈撶殑鍙傛暟涓篺alse灏变笉闇�瑕佸垱寤轰笁鍛�
- if(!this.ssaEnable && !tenant.getMembersFlag()){
+ // 閰嶇疆涓篺alse锛屽苟涓斿墠绔紶杈撶殑鍙傛暟涓�1(鏈�夋嫨寮�鍚�)灏变笉闇�瑕佸垱寤轰笁鍛�
+ if(!this.ssaEnable && !(tenant.getSsaEnable()==1)){
// 涓嶅紑鍚笁鍛樼鐞嗘椂鐩存帴鍒涘缓涓�涓渶楂樻潈闄愮殑绠＄悊鍛�
Role role = new Role(tenantId,BladeConstant.TOP_PARENT_ID,"瓒呯骇绠＄悊鍛�",1,"admin",BladeConstant.DB_NOT_DELETED);
roleService.save(role);
@@ -127,7 +127,7 @@
Dept dept = generateDept(tenantId, tenant);
deptService.save(dept);
// 鏂板缓绉熸埛瀵瑰簲鐨勯粯璁ゅ矖浣�
- Post postInfo = generatePost(tenantId, 1, "ceo", "棣栧腑鎵ц瀹�", 1);
+ Post postInfo = generatePost(tenantId, 1, "admin", "绠＄悊鍛�", 1);
postService.save(postInfo);
// 鏂板缓绉熸埛瀵瑰簲鐨勯粯璁や笟鍔″瓧鍏�
LinkedList<DictBiz> dictBizs = new LinkedList<>();
@@ -161,18 +161,18 @@
Dept dept = generateDept(tenantId, tenant);
deptService.save(dept);
// 鏂板缓绉熸埛瀵瑰簲鐨勯粯璁ゅ矖浣�
- Post postCeo = generatePost(tenantId, 1, "sysAdmin", "绯荤粺绠＄悊鍛�", 1);
- Post postCto = generatePost(tenantId,1,"secAdmin","瀹夊叏绠＄悊鍛�",4);
- Post postCio = generatePost(tenantId,1,"auditAdmin","瀹¤绠＄悊鍛�",5);
- postService.saveBatch(Arrays.asList(postCeo,postCto,postCio));
+ Post postSys = generatePost(tenantId, 1, this.ssaNames.get(0), "绯荤粺绠＄悊鍛�", 1);
+ Post postSec = generatePost(tenantId,1,this.ssaNames.get(1),"瀹夊叏绠＄悊鍛�",4);
+ Post postAudit = generatePost(tenantId,1,this.ssaNames.get(2),"瀹¤绠＄悊鍛�",5);
+ postService.saveBatch(Arrays.asList(postSys,postSec,postAudit));
// 鏂板缓绉熸埛瀵瑰簲鐨勯粯璁や笟鍔″瓧鍏�
LinkedList<DictBiz> dictBizs = new LinkedList<>();
List<DictBiz> dictBizList = getDictBizs(tenantId, dictBizs);
dictBizService.saveBatch(dictBizList);
// 鏂板缓绉熸埛瀵瑰簲鐨勯粯璁ょ鐞嗙敤鎴�
- User userSys = generateUser(tenantId, roleSys, dept, postCeo);
- User userSec = generateUser(tenantId,roleSec,dept,postCto);
- User userAudit = generateUser(tenantId,roleAudit,dept,postCio);
+ User userSys = generateUser(tenantId, roleSys, dept, postSys);
+ User userSec = generateUser(tenantId,roleSec,dept,postSec);
+ User userAudit = generateUser(tenantId,roleAudit,dept,postAudit);
// 鍏堜繚瀛樼鎴�
boolean temp = super.saveOrUpdate(tenant);
// 鍒涘缓鐢ㄦ埛
@@ -261,8 +261,8 @@
private void saveRoleMenus(Role role,List<String> stringMenus){
LinkedList<Menu> userMenus = new LinkedList<>();
// 鑾峰彇鍙傛暟閰嶇疆鐨勯粯璁よ彍鍗曢泦鍚堬紝閫楀彿闅斿紑
- List<String> menuCodes = Func.toStrList(ParamCache.getValue(ACCOUNT_MENU_CODE_KEY));
- List<Menu> menus = getMenus((menuCodes.size() > 0 ? menuCodes : stringMenus), userMenus);
+ //List<String> menuCodes = Func.toStrList(ParamCache.getValue(ACCOUNT_MENU_CODE_KEY));
+ List<Menu> menus = getMenus((stringMenus), userMenus);
List<RoleMenu> roleMenus = new ArrayList<>();
//鍒涘缓鎵�鏈夎彍鍗曡鑹插叧鑱斿璞�
menus.forEach(menu -> {
--
Gitblit v1.9.3