wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2595-分页查询接口去掉人员状态查询条件

Browse Source
This commit is contained in:
yangqicheng 2024-11-24 09:23:09 +08:00
parent 35e335d6df
commit 184e512e88
3 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java
View File

@ -1,10 +1,6 @@
package cn.axzo.msg.center.message.service.todo;
import cn.axzo.framework.domain.web.result.ApiListResult;
import cn.axzo.maokai.api.client.OrgUserApi;
import cn.axzo.maokai.api.vo.request.OrgUserListReq;
import cn.axzo.maokai.api.vo.request.WorkspaceOuPair;
import cn.axzo.maokai.api.vo.response.OrgUserRes;
import cn.axzo.maokai.api.vo.response.tree.ValueNode;
import cn.axzo.msg.center.common.enums.TableIsDeleteEnum;
import cn.axzo.msg.center.common.utils.BizAssertions;
@ -64,7 +60,6 @@ public class TodoSimpleQueryService {
private final TodoRespBuilder todoRespBuilder;
private final PendingMessageBizConfig cfg;
private final GroupTemplateService groupTemplateService;
private final OrgUserApi orgUserApi;
public PendingMessageResponse query(PendingMessageQueryRequest req) {
// 虽然通过code可以查询到唯一的记录, 把一些事情交给数据库去库, 成本不高
@ -227,40 +222,6 @@ public class TodoSimpleQueryService {
} else if (CollectionUtils.isNotEmpty(request.getTemplateCodes())) {
valuableTempCodes.addAll(request.getTemplateCodes());
}
List<GetTodoPageRequest.Executor> valuableExecutors = new ArrayList<>();
if (CollectionUtils.isNotEmpty(request.getExecutors())) {
for (GetTodoPageRequest.Executor executor : request.getExecutors()) {
if (CollectionUtils.isNotEmpty(executor.getOrgUserStatusEnums())) {
OrgUserListReq req = OrgUserListReq.builder()
.ouWorkspacePairs(Collections.singletonList(WorkspaceOuPair.builder()
.workspaceId(executor.getWorkspaceId())
.ouId(executor.getOuId())
.build()))
.statusColl(executor.getOrgUserStatusEnums())
.build();
if (CollectionUtils.isNotEmpty(executor.getPersonIds())) {
req.setPersonIds(executor.getPersonIds());
}
List<OrgUserRes> orgUserRes = rpcApiListResultProcessor(() -> orgUserApi.listOrgUser(req), "获取orgUser人员信息", req);
if (CollectionUtils.isNotEmpty(orgUserRes)) {
List<Long> valuablePersonIds = orgUserRes.stream()
.map(OrgUserRes::getPersonId)
.filter(pId -> pId != null && pId > 0)
.collect(toList());
if (CollectionUtils.isNotEmpty(valuablePersonIds)) {
executor.setPersonIds(valuablePersonIds);
valuableExecutors.add(executor);
}
}
} else {
valuableExecutors.add(executor);
}
}
if (CollectionUtils.isEmpty(valuableExecutors)) {
IPage<PendingMessageSimpleDTO> page = request.toPage();
return Page.toPage(page.getCurrent(), page.getSize(), 0L, Collections.emptyList());
}
}
IPage<Todo> page = todoDao.lambdaQuery()
.in(CollectionUtils.isNotEmpty(request.getIdentityCodes()), Todo::getIdentityCode, request.getIdentityCodes())
@ -268,7 +229,7 @@ public class TodoSimpleQueryService {
.in(CollectionUtils.isNotEmpty(request.getBizCodes()), Todo::getBizCode, request.getBizCodes())
.in(CollectionUtils.isNotEmpty(request.getStates()), Todo::getState, request.getStates())
.likeRight(StringUtils.isNotBlank(request.getTitleLike()), Todo::getTitle, request.getTitleLike())
.and(CollectionUtils.isNotEmpty(valuableExecutors), wrapper -> {
.and(CollectionUtils.isNotEmpty(request.getExecutors()), wrapper -> {
for (GetTodoPageRequest.Executor executor : request.getExecutors()) {
wrapper.or()
.eq(executor.getOuId() != null, Todo::getOuId, executor.getOuId())

1
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoPageRequest.java
View File

@ -62,7 +62,6 @@ public class GetTodoPageRequest extends PageRequest {
private Long ouId;
private Long workspaceId;
private List<Long> personIds;
private List<OrgUserStatusEnum> orgUserStatusEnums;
}
@Override

3
start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java
View File

@ -25,8 +25,7 @@ import org.springframework.core.env.Environment;
"cn.axzo.pluto.api",
"cn.axzo.basics.profiles.api",
"cn.axzo.apollo.api",
"cn.axzo.msg.center.inside.notices.service.impl",
"cn.axzo.maokai.api"
"cn.axzo.msg.center.inside.notices.service.impl"
})
/*@EnableAsync*/
public class MsgCenterApplication {