总部--bug修改

src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java

@@ -69,15 +69,16 @@ 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();
+        if (falg) {
             String randomString = RandomStringUtils.getRandomString(6);
             Timestamp timestamp = new Timestamp(System.currentTimeMillis());
             BeanUtils.copyProperties(tenanBaseDto, group);
@@ -98,12 +99,16 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
             } 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);
+        if (falg) {
             for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) {
                 String tenantGroupCompanyCode1 = ocpTenantGroup.getTenantGroupName();
                 if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)) {
@@ -111,6 +116,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
                     group.setNum("1");
                 }
             }
+        }
 
 
         if (falg) {