From 4cb7646afbdd58363738bbf5319284865d82283b Mon Sep 17 00:00:00 2001
From: aeizzz <aeizzz@foxmail.com>
Date: Fri, 9 Dec 2022 16:44:55 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=9D=9E=E9=BB=98=E8=AE=A4=E7=A7=9F=E6=88=B7=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=EF=BC=8C=E8=8E=B7=E5=8F=96=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysTenantServiceImpl.java    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
index 5b40508f1..d094ce313 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
@@ -76,6 +76,8 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
 	private final SysDictService dictService;
 
+	private final SysTenantMenuService sysTenantMenuService;
+
 	/**
 	 * 获取正常状态租户
 	 * <p>
@@ -109,6 +111,8 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 		String defaultPassword = ParamResolver.getStr("TENANT_DEFAULT_PASSWORD", "123456");
 		String defaultRoleCode = ParamResolver.getStr("TENANT_DEFAULT_ROLECODE", "ROLE_ADMIN");
 		String defaultRoleName = ParamResolver.getStr("TENANT_DEFAULT_ROLENAME", "租户默认角色");
+		String userDefaultRoleCode = ParamResolver.getStr("USER_DEFAULT_ROLECODE", "GENERAL_USER");
+		String userDefaultRoleName = ParamResolver.getStr("USER_DEFAULT_ROLENAME", "普通用户");
 
 		List<SysDict> dictList = new ArrayList<>(32);
 		List<Long> dictIdList = new ArrayList<>(32);
@@ -148,7 +152,14 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 			user.setPassword(ENCODER.encode(defaultPassword));
 			user.setDeptId(dept.getDeptId());
 			userService.save(user);
-			// 构造新角色
+
+			// 构造普通用户角色
+			SysRole roleDefault = new SysRole();
+			roleDefault.setRoleCode(userDefaultRoleCode);
+			roleDefault.setRoleName(userDefaultRoleName);
+			roleService.save(roleDefault);
+
+			// 构造新角色 管理员角色
 			SysRole role = new SysRole();
 			role.setRoleCode(defaultRoleCode);
 			role.setRoleName(defaultRoleName);
@@ -160,7 +171,11 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 			userRoleService.save(userRole);
 			// 插入新的菜单
 			saveTenantMenu(menuList, CommonConstants.MENU_TREE_ROOT_ID, CommonConstants.MENU_TREE_ROOT_ID);
-			List<SysMenu> newMenuList = menuService.list();
+
+			SysTenantMenu tenantMenu = sysTenantMenuService.getById(sysTenant.getMenuId());
+
+			List<SysMenu> newMenuList = menuService
+					.list(Wrappers.<SysMenu>lambdaQuery().in(SysMenu::getMenuId, tenantMenu.getMenuIds()));
 
 			// 查询全部菜单,构造角色菜单关系
 			List<SysRoleMenu> roleMenuList = newMenuList.stream().map(menu -> {