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

Merge branch 'refs/heads/feature/REQ-2699' into dev

Browse Source
This commit is contained in:
yanglin 2024-08-22 17:40:05 +08:00
commit a1cc32014e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -374,7 +374,7 @@ public class TodoRangeQueryService {
List<Todo> todos = todoDao.list(query(Todo.class)
.eq(Todo::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.eq(Todo::getState, PendingMessageStateEnum.HAS_BEEN_SENT)
.eq(request.getWorkspaceId() != null, Todo::getOrgId, request.getWorkspaceId())
.in(CollectionUtils.isNotEmpty(request.getWorkspaceIds()), Todo::getOrgId, request.getWorkspaceIds())
.in(CollectionUtils.isNotEmpty(request.getPersonIds()), Todo::getExecutorPersonId, request.getPersonIds())
.in(CollectionUtils.isNotEmpty(request.getOuIds()), Todo::getOuId, request.getOuIds())
.in(CollectionUtils.isNotEmpty(request.getTemplateCodes()), Todo::getTemplateCode, request.getTemplateCodes())

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

@ -4,6 +4,7 @@ import cn.axzo.msg.center.service.enums.TerminalTypeEnum;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.util.Set;
/**
@ -27,7 +28,7 @@ public class GetPendingTodosRequest {
/**
* 项目id
*/
private Long workspaceId;
private List<Long> workspaceIds;
/**
* 最大查询数据. 最多不超过 5000
*/