Commit 33834ca3 authored by zhaochengming's avatar zhaochengming

服务bug修改

parent 39766421
...@@ -9,6 +9,10 @@ import com.pms.ocp.model.entity.OcpApiGroup; ...@@ -9,6 +9,10 @@ import com.pms.ocp.model.entity.OcpApiGroup;
import java.util.List; import java.util.List;
/**
* @author zhaochengming
*/
public interface OcpApiTreeService extends IService<OcpApiGroup> { public interface OcpApiTreeService extends IService<OcpApiGroup> {
/** /**
......
...@@ -11,6 +11,10 @@ import com.pms.ocp.model.vo.ResponseVO; ...@@ -11,6 +11,10 @@ import com.pms.ocp.model.vo.ResponseVO;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
/**
* @author zhaochengming
*/
public interface TenantService extends IService<OcpTenantGroup> { public interface TenantService extends IService<OcpTenantGroup> {
/** /**
* 应用树分类管理 * 应用树分类管理
......
...@@ -25,6 +25,10 @@ import java.util.List; ...@@ -25,6 +25,10 @@ import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
/**
* @author zhaochengming
*/
@Service @Service
@Slf4j @Slf4j
public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiGroup> implements OcpApiTreeService { public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiGroup> implements OcpApiTreeService {
...@@ -166,7 +170,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG ...@@ -166,7 +170,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
pageInfo.setRecords(ocpApiGroups); pageInfo.setRecords(ocpApiGroups);
pageInfo.setTotal(ocpApiGroups.size()); pageInfo.setTotal(ocpApiGroups.size());
} }
} else { } else if(StringUtils.isNotBlank(pageGroupDto.getKeyword())){
LambdaQueryWrapper<OcpApiGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) LambdaQueryWrapper<OcpApiGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword()))
.or().like(OcpApiGroup::getApiGroupUserName, pageGroupDto.getKeyword()) .or().like(OcpApiGroup::getApiGroupUserName, pageGroupDto.getKeyword())
.or().like(OcpApiGroup::getApiGroupPcode, pageGroupDto.getKeyword()); .or().like(OcpApiGroup::getApiGroupPcode, pageGroupDto.getKeyword());
......
...@@ -24,6 +24,9 @@ import java.sql.Timestamp; ...@@ -24,6 +24,9 @@ import java.sql.Timestamp;
import java.util.*; import java.util.*;
/**
* @author zhaochengming
*/
@Service @Service
public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> implements TenantService { public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> implements TenantService {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment