From 2472d9772799c8af663f0c845b5292fe51b44cd9 Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Thu, 31 Mar 2022 02:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E9=83=A8--bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocp/service/impl/TenantServiceImpl.java   | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
index 1c0c43f..0183268 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
@@ -69,46 +69,52 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
      */
     @Override
     public OcpTenantGroup getTenanInster(TenanBaseDto tenanBaseDto) {
+        OcpTenantGroup group = new OcpTenantGroup();
         boolean falg = true;
         if (StringUtils.isNotBlank(tenanBaseDto.getTenantGroupCode())) {
             List<OcpTenantBase> ocpTenantBases = ocpTenantBaseMapper.selcctCodeList(tenanBaseDto.getTenantGroupCode());
             if (ocpTenantBases.size() > 0) {
+                group.setNum("1");
                 falg = false;
             }
         }
-
-        OcpTenantGroup group = new OcpTenantGroup();
-        String randomString = RandomStringUtils.getRandomString(6);
-        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-        BeanUtils.copyProperties(tenanBaseDto, group);
-        group.setTenantGroupPcode(tenanBaseDto.getTenantGroupCode());
-        group.setTenantType("应用");
-        group.setTenantGroupVersion("1.0");
-        group.setTenantGroupCode(randomString);
-        group.setTenantGroupOrderNo(1);
-        group.setTenantGroupCtime(timestamp);
-        group.setTenantGroupMtime(timestamp);
-        group.setTenantGroupVersion("1.0");
-        group.setTenantGroupCode(randomString);
-
-        if ("Middleground".equals(tenanBaseDto.getTenantGroupLevel())) {
-            group.setTenantGroupLevel("sys_center");
-        } else if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())) {
-            group.setTenantGroupLevel("api_group");
-        } else if (StringUtils.isBlank(tenanBaseDto.getTenantGroupLevel())) {
-            group.setTenantGroupLevel("Middleground");
-        }
-        group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode());
+        if (falg) {
+            String randomString = RandomStringUtils.getRandomString(6);
+            Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+            BeanUtils.copyProperties(tenanBaseDto, group);
+            group.setTenantGroupPcode(tenanBaseDto.getTenantGroupCode());
+            group.setTenantType("应用");
+            group.setTenantGroupVersion("1.0");
+            group.setTenantGroupCode(randomString);
+            group.setTenantGroupOrderNo(1);
+            group.setTenantGroupCtime(timestamp);
+            group.setTenantGroupMtime(timestamp);
+            group.setTenantGroupVersion("1.0");
+            group.setTenantGroupCode(randomString);
+
+            if ("Middleground".equals(tenanBaseDto.getTenantGroupLevel())) {
+                group.setTenantGroupLevel("sys_center");
+            } else if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())) {
+                group.setTenantGroupLevel("api_group");
+            } else if (StringUtils.isBlank(tenanBaseDto.getTenantGroupLevel())) {
+                group.setTenantGroupLevel("Middleground");
+            }
+            if (StringUtils.isBlank(tenanBaseDto.getTenantGroupCompanyCode())) {
+                group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode());
+            }
 
 
+        }
         String tenantGroupCompanyCode = tenanBaseDto.getTenantGroupName();
         //判断是否含有相同的分类名称
         List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectList(null);
-        for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) {
-            String tenantGroupCompanyCode1 = ocpTenantGroup.getTenantGroupName();
-            if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)) {
-                falg = false;
-                group.setNum("1");
+        if (falg) {
+            for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) {
+                String tenantGroupCompanyCode1 = ocpTenantGroup.getTenantGroupName();
+                if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)) {
+                    falg = false;
+                    group.setNum("1");
+                }
             }
         }
 
-- 
2.26.0