From 48b0b608d8af37615aadd88e2be5cec798f3e595 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 29 Dec 2023 19:42:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysTenantPackServiceImpl.java        | 35 ++++++++++++++-----
 .../service/impl/SysTenantServiceImpl.java    |  6 +++-
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java
index 8401dbe0..1af48f7d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java
@@ -128,11 +128,19 @@ public class SysTenantPackServiceImpl extends ServiceImpl<SysTenantPackMapper, S
 
     @Override
     public void addDefaultTenantPack(Integer tenantId) {
+        LambdaQueryWrapper<SysTenantPack> query = new LambdaQueryWrapper<>();
+        query.eq(SysTenantPack::getTenantId,tenantId);
         // 创建超级管理员
         SysTenantPack superAdminPack = new SysTenantPack(tenantId, "超级管理员", TenantConstant.SUPER_ADMIN);
         ISysTenantPackService currentService = SpringContextUtils.getApplicationContext().getBean(ISysTenantPackService.class);
-        String packId = currentService.saveOne(superAdminPack);
-
+        query.eq(SysTenantPack::getPackCode, TenantConstant.SUPER_ADMIN);
+        SysTenantPack sysTenantPackSuperAdmin = currentService.getOne(query);
+        String packId = "";
+        if(null == sysTenantPackSuperAdmin){
+            packId = currentService.saveOne(superAdminPack);
+        }else{
+            packId = sysTenantPackSuperAdmin.getId();
+        }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         SysTenantPackUser packUser = new SysTenantPackUser(tenantId, packId, sysUser.getId());
         packUser.setRealname(sysUser.getRealname());
@@ -140,13 +148,22 @@ public class SysTenantPackServiceImpl extends ServiceImpl<SysTenantPackMapper, S
         //添加人员和管理员的关系数据
         currentService.savePackUser(packUser);
 
-        // 创建超级管理员
-        SysTenantPack accountAdminPack = new SysTenantPack(tenantId, "组织账户管理员", TenantConstant.ACCOUNT_ADMIN);
-        currentService.saveOne(accountAdminPack);
-
-        // 创建超级管理员
-        SysTenantPack appAdminPack = new SysTenantPack(tenantId, "组织应用管理员", TenantConstant.APP_ADMIN);
-        currentService.saveOne(appAdminPack);
+        query.eq(SysTenantPack::getPackCode, TenantConstant.ACCOUNT_ADMIN);
+        SysTenantPack sysTenantPackAccountAdmin = currentService.getOne(query);
+        if(null == sysTenantPackAccountAdmin){
+            // 创建超级管理员
+            SysTenantPack accountAdminPack = new SysTenantPack(tenantId, "组织账户管理员", TenantConstant.ACCOUNT_ADMIN);
+            currentService.saveOne(accountAdminPack);
+        }
+        
+        query.eq(SysTenantPack::getPackCode, TenantConstant.APP_ADMIN);
+        SysTenantPack sysTenantPackAppAdmin = currentService.getOne(query);
+        
+        if(null == sysTenantPackAppAdmin){
+            // 创建超级管理员
+            SysTenantPack appAdminPack = new SysTenantPack(tenantId, "组织应用管理员", TenantConstant.APP_ADMIN);
+            currentService.saveOne(appAdminPack);
+        }
         
     }
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
index 751ddeb8..01368fec 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
@@ -156,7 +156,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         sysTenantPackService.addDefaultTenantPack(tenantId);
         
         //添加租户到关系表
-        return this.saveTenantRelation(sysTenant.getId(), userId);
+        return tenantId;
     }
 
     @Override
@@ -164,6 +164,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         //获取租户id
         sysTenant.setId(this.tenantIdGenerate());
         sysTenant.setHouseNumber(RandomUtil.randomStringUpper(6));
+        sysTenant.setDelFlag(CommonConstant.DEL_FLAG_0);
         this.save(sysTenant);
         //update-begin---author:wangshuai ---date:20230710  for：【QQYUN-5723】1、把当前创建人加入到租户关系里面------------
         //当前登录人的id
@@ -680,6 +681,9 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         messageDTO.setData(data);
         messageDTO.setContent(title);
         messageDTO.setType("system");
+        //update-begin---author:wangshuai---date:2023-11-24---for:【QQYUN-7168】邀请成员时，会报错，但实际已经邀请成功了---
+        messageDTO.setCategory(CommonConstant.MSG_CATEGORY_1);
+        //update-end---author:wangshuai---date:2023-11-24---for:【QQYUN-7168】邀请成员时，会报错，但实际已经邀请成功了---
         //update-begin---author:wangshuai ---date:20230721  for：【QQYUN-5726】邀请加入租户加个按钮直接跳转过去------------
         messageDTO.setBusType(SysAnnmentTypeEnum.TENANT_INVITE.getType());
         sysBaseApi.sendBusAnnouncement(messageDTO);