From ea5b6f7c5ca313f9eec9a6ee6b38d29786dde565 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Wed, 9 Oct 2024 10:07:12 +0800
Subject: [PATCH] =?UTF-8?q?REQ-2752:=20=E5=AE=9A=E4=B9=89=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/service/todo/TodoSimpleQueryService.java  |  3 ++-
 .../service/pending/request/GetTodoRequest.java       | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

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<PendingMessageSimpleDTO> getTodosSimple(GetTodoRequest request) {
+        //todo
         List<Todo> 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<String> identityCodes;
     private Set<String> templateCodes;
     private Set<String> bizCodes;
-    private Set<Long> executorPersonIds;
     private Set<PendingMessageStateEnum> states;
+    private List<Executor> executors;
+
+    @Setter
+    @Getter
+    public static class Executor {
+        private Long ouId;
+        private Long workspaceId;
+        private List<Long> personIds;
+    }
 
     @Override
     public String toString() {