Merge remote-tracking branch 'origin/master'

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

@@ -106,6 +106,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
             if (StringUtils.isBlank(ocpApiGroup.getApiGroupLevel())) {
                 ocpApiGroup.setApiGroupLevel("Middleground");
             }
+            if (StringUtils.isNotBlank(ocpApiGroup.getClassIfy())) {
+                ocpApi.setClassIfy(ocpApiGroup.getClassIfy());
+            }
             mapper.insert(ocpApi);
         } else {
             return ocpApi;

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,18 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
             } else if (StringUtils.isBlank(tenanBaseDto.getTenantGroupLevel())) {
                 group.setTenantGroupLevel("Middleground");
             }
-        group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode());
+            if (StringUtils.isNotBlank(tenanBaseDto.getTenantGroupCode())) {
+                OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenanBaseDto.getTenantGroupCode());
+                String tenantGroupName = ocpTenantGroup.getTenantGroupName();
+                group.setClassIfy(tenantGroupName);
+            }
 
 
+        }
         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 +118,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
                     group.setNum("1");
                 }
             }
+        }
 
 
         if (falg) {

src/main/resources/mapper/OcpApiGroupMapper.xml

@@ -132,7 +132,7 @@
                 and oag.api_group_name = #{apiGroupName}
             </if>
         </where>
-        order by oab.api_mtime desc
+        order by oab.api_ctime desc
     </select>
 
 

src/main/resources/mapper/OcpTenantBaseMapper.xml

@@ -31,7 +31,7 @@
         where tenant_name = #{appName}
     </select>
 
-    <select id="selcctCodeList" resultType="java.lang.Integer">
+    <select id="selcctCodeList" resultType="com.pms.ocp.model.entity.OcpTenantBase">
         select *
         from ocp_tenant_base
         where tenant_group_code = #{tenantGroupCode}