总部--bug修改

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");
+                }
             }
         }