diff --git a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java index 84f6f3194ebc61e4fa3a23764a4ec54fdd89123a..05c0ba7083ea34666720123a8594a3cd439b67e6 100644 --- a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java +++ b/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("新增应用注册失败"); diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index d256d087ab9b09985d547e9801f609ff8a1f58ee..37f6f44265a6f2163d52c87ea4596f0c74e62fbc 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -264,7 +264,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); List 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); } }