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

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

@@ -373,6 +373,7 @@ public class TodoRangeQueryService {
     public List<PendingMessageResponse> getPendingTodos(GetPendingTodosRequest request) {
         List<Todo> todos = todoDao.list(query(Todo.class)
                 .eq(Todo::getIsDelete, TableIsDeleteEnum.NORMAL.value)
+                .eq(request.getWorkspaceId() != null, Todo::getOrgId, request.getWorkspaceId())
                 .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())

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

@@ -24,7 +24,10 @@ public class GetPendingTodosRequest {
      * 模版id
      */
     private Set<String> templateCodes;
-
+    /**
+     * 项目id
+     */
+    private Long workspaceId;
     /**
      * 最大查询数据. 最多不超过 5000
      */