diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java index fe8dbad5..6a9da426 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java @@ -128,11 +128,12 @@ public class TodoSimpleQueryService { } public List getTodosSimple(GetTodoRequest request) { + //todo List todos = todoDao.lambdaQuery() .in(CollectionUtils.isNotEmpty(request.getIdentityCodes()), Todo::getIdentityCode, request.getIdentityCodes()) .in(CollectionUtils.isNotEmpty(request.getTemplateCodes()), Todo::getTemplateCode, request.getTemplateCodes()) .in(CollectionUtils.isNotEmpty(request.getBizCodes()), Todo::getBizCode, request.getBizCodes()) - .in(CollectionUtils.isNotEmpty(request.getExecutorPersonIds()), Todo::getExecutorPersonId, request.getExecutorPersonIds()) + //.in(CollectionUtils.isNotEmpty(request.getExecutorPersonIds()), Todo::getExecutorPersonId, request.getExecutorPersonIds()) .in(CollectionUtils.isNotEmpty(request.getStates()), Todo::getState, request.getStates()) .last("LIMIT " + cfg.getGetTodoSimpleSize()) .list(); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoRequest.java index 9e42978c..a1deab0b 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoRequest.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; import lombok.Getter; import lombok.Setter; +import java.util.List; import java.util.Set; /** @@ -16,8 +17,16 @@ public class GetTodoRequest { private Set identityCodes; private Set templateCodes; private Set bizCodes; - private Set executorPersonIds; private Set states; + private List executors; + + @Setter + @Getter + public static class Executor { + private Long ouId; + private Long workspaceId; + private List personIds; + } @Override public String toString() {