diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index bfa0fcf007b1d7a25230de13809b5c53dca03f30..b54d0068dba9664a04ff851c6f0304eb7a57345e 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -77,8 +77,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); for (OcpApiGroup apiGroup : ocpApiGroups) { @@ -103,6 +111,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl if (falg) { tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode()); tenantMapper.insert(group); - group = tenantMapper.selectById(tenanBaseDto.getObjId()); } + return group; } @@ -143,17 +143,6 @@ public class TenantServiceImpl extends ServiceImpl flag = false; } -// List ocpTenantGroupList = tenantMapper.selectList(null); -// for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { -// String tenantGroupPcode = tenantGroup.getTenantGroupPcode(); -// if ((ocpTenantGroup.getTenantGroupCode().equals(tenantGroupPcode))) { -// flag = false; -// break; -// } -// } - - - return flag; } @@ -169,7 +158,7 @@ public class TenantServiceImpl extends ServiceImpl LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); Page page = new Page<>(currentPage, pageSize); if (StringUtils.isBlank(keyword)) { - if("".equals(lev)) { + if("".equals(lev) || "1".equals(lev)) { LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); tenantMapper.selectPage(page, eq); }else if ("2".equals(lev) || "3".equals(lev)) { diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index c0d8c2e5bce994667cdbfb88909aff35e0a98c55..c5366b2ac0dfaff3cf0eb8df3ac4ba51074d3c90 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,11 +2,11 @@ spring: datasource: driver-class-name: org.postgresql.Driver username: postgres - password: root + password: 1234 type: com.zaxxer.hikari.HikariDataSource # jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true # jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true - url: jdbc:postgresql://localhost:5432/model?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true + url: jdbc:postgresql://localhost:5432/pms_accept?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true knife4j: enable: true