REQ-3540: 添加购买时间
This commit is contained in:
parent
77ad340701
commit
b821ef5c19
@ -197,14 +197,14 @@ public class FileDatabaseService {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public Page<FileDatabaseInfoResponse> search(FileDatabaseSearchRequest request) {
|
||||
List<Long> seachWorkspaceIds = null;
|
||||
List<Long> searchWorkspaceIds = null;
|
||||
if (StringUtils.isNotBlank(request.getWorkspaceName())) {
|
||||
GetSimpleWorkspaceReqV2 workspaceSearchRequest1 = new GetSimpleWorkspaceReqV2();
|
||||
workspaceSearchRequest1.setLikeName(request.getWorkspaceName());
|
||||
seachWorkspaceIds = RpcExternalUtil.rpcApolloProcessor(
|
||||
searchWorkspaceIds = RpcExternalUtil.rpcApolloProcessor(
|
||||
() -> workspaceApi.getListV2(workspaceSearchRequest1), "查询工作台列表1", workspaceSearchRequest1) //
|
||||
.stream().map(SimpleWorkspaceRes::getId).collect(toList());
|
||||
if (seachWorkspaceIds.isEmpty())
|
||||
if (searchWorkspaceIds.isEmpty())
|
||||
return Page.zero();
|
||||
}
|
||||
|
||||
@ -227,7 +227,7 @@ public class FileDatabaseService {
|
||||
// @formatter:off
|
||||
IPage<FileDatabase> page = fileDatabaseDao.lambdaQuery()
|
||||
.eq(request.getState() != null, FileDatabase::getState, request.getState())
|
||||
.in(CollectionUtils.isNotEmpty(seachWorkspaceIds), FileDatabase::getWorkspaceId, seachWorkspaceIds)
|
||||
.in(CollectionUtils.isNotEmpty(searchWorkspaceIds), FileDatabase::getWorkspaceId, searchWorkspaceIds)
|
||||
.in(CollectionUtils.isNotEmpty(seachTemplateDatabaseCodes), FileDatabase::getTemplateDatabaseCode, seachTemplateDatabaseCodes) //
|
||||
.in(CollectionUtils.isNotEmpty(seachScopes), FileDatabase::getScope, seachScopes)
|
||||
.ne(FileDatabase::getScope, IndexNodeScope.ANONYMOUS)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user