diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java index 98ddfe7a7bb27a005e507aee6804d93dc565cc4c..da29dcca08cf36388f83a0c3d8852ffc528819e7 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java @@ -18,6 +18,12 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; + + +/** + * @author zhaochengming + * + */ @Slf4j @RequestMapping("/tenant-group/v1") @RestController @@ -33,7 +39,7 @@ public class OcpTenantGroupIocnController { - /** + /**@author:zhaochengming * 我的应用--服务列表 * @return */ @@ -44,7 +50,7 @@ public class OcpTenantGroupIocnController { return ResponseVO.ok(ocpgroup); } - /** + /**@author:zhaochengming * 我的应用--应用删除 * @return */ @@ -60,6 +66,11 @@ public class OcpTenantGroupIocnController { } + /** + * @author:zhaochengming + * @param objId + * @return + */ @GetMapping("/details") @ApiModelProperty("我的应用--应用详情") private ResponseVO selectDetails(String objId) { diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java index 7ae795a96e3808c42d058c4b393cea7d289982cb..a45b6059a56e41002be6e22c14d1929ead0ad49d 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java @@ -17,7 +17,10 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; - +/** + * @author:zhaochengming + * + */ @Service public class OcpTenantIocnServiceImpl extends ServiceImpl implements OcpTenantIocnService { diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index b3cbf9aeba68632e67fa6a49f2984dd757d021a3..22abfe23dd5d1b5eb281cf770ea341da7dbc59dd 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -175,12 +175,13 @@ public class TenantServiceImpl extends ServiceImpl Page page = new Page<>(currentPage, pageSize); if (StringUtils.isBlank(keyword)) { - if (StringUtils.isBlank(lev) || "1".equals(lev) ) { + if (StringUtils.isBlank(lev) || "1".equals(lev)) { LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); tenantMapper.selectPage(page, eq); } else if ("2".equals(lev) || "3".equals(lev)) { - LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); - tenantMapper.selectPage(page,eq); + LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)) + .eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); + tenantMapper.selectPage(page, eq); } } else if (!(StringUtils.isBlank(keyword))) { LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword))