Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java

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

@@ -71,14 +71,14 @@ public class AppRegisterServiceImpl implements AppRegisterService {
         ocpTenantExtent.setTenantState((short) 0);
         int j = ocpTenantExtentMapper.insert(ocpTenantExtent);
 
-        OcpTenantGroup ocpTenantGroup = new OcpTenantGroup();
-        ocpTenantGroup.setTenantGroupUserId(appRegisterDTO.getUserId());
-        ocpTenantGroup.setTenantGroupUserName(appRegisterDTO.getUserName());
-        ocpTenantGroup.setTenantGroupCtime(new Timestamp(System.currentTimeMillis()));
-        ocpTenantGroup.setTenantGroupCode(GUIDGenerator.generate32(true));
-        ocpTenantGroup.setTenantGroupName(appRegisterDTO.getType());
-        ocpTenantGroup.setIsDelete((short) 0);
-        int m = ocpTenantGroupMapper.insert(ocpTenantGroup);
+//        OcpTenantGroup ocpTenantGroup = new OcpTenantGroup();
+//        ocpTenantGroup.setTenantGroupUserId(appRegisterDTO.getUserId());
+//        ocpTenantGroup.setTenantGroupUserName(appRegisterDTO.getUserName());
+//        ocpTenantGroup.setTenantGroupCtime(new Timestamp(System.currentTimeMillis()));
+//        ocpTenantGroup.setTenantGroupCode(GUIDGenerator.generate32(true));
+//        ocpTenantGroup.setTenantGroupName(appRegisterDTO.getType());
+//        ocpTenantGroup.setIsDelete((short) 0);
+//        int m = ocpTenantGroupMapper.insert(ocpTenantGroup);
 
         OcpTenantBase ocpTenantBase = new OcpTenantBase();
         ocpTenantBase.setTenantUserId(appRegisterDTO.getUserId());
@@ -90,11 +90,11 @@ public class AppRegisterServiceImpl implements AppRegisterService {
         ocpTenantBase.setTenantUnit(appRegisterDTO.getManufacturer());
         ocpTenantBase.setTenantVersion(appRegisterDTO.getVersion());
         ocpTenantBase.setTenantCtime(new Timestamp(System.currentTimeMillis()));
-        ocpTenantBase.setTenantGroupCode(ocpTenantGroup.getTenantGroupCode());
+        ocpTenantBase.setTenantGroupCode(appRegisterDTO.getType());
         ocpTenantBase.setIsDelete((short) 0);
         int i = ocpTenantBaseMapper.insert(ocpTenantBase);
 
-        if (n > 0 && i > 0 && j > 0 && m > 0) {
+        if (n > 0 && i > 0 && j > 0) {
             return ResponseVO.ok();
         }
         return ResponseVO.error("新增应用注册失败");

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

@@ -264,7 +264,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         List<GroupDto> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
         List<GroupDto> list = new ArrayList<>();
         for (GroupDto ocpTenantGroup : ocpTenantGroups) {
-            if (StringUtils.isNotBlank(ocpTenantGroup.getTenantCode())&&StringUtils.isNotBlank(ocpTenantGroup.getTenantName())){
+            if (StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupCode())&&StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupName())){
                 list.add(ocpTenantGroup);
             }
         }