diff --git a/src/main/java/com/xdap/self_development/controller/TodoTaskController.java b/src/main/java/com/xdap/self_development/controller/TodoTaskController.java
index 461265e..d8bac6f 100644
--- a/src/main/java/com/xdap/self_development/controller/TodoTaskController.java
+++ b/src/main/java/com/xdap/self_development/controller/TodoTaskController.java
@@ -27,15 +27,15 @@ public class TodoTaskController {
     @Autowired
     private TodoTaskService todoTaskService;
     /**
-     * 通过创建人查询待办
+     * 查询发起的待办
      */
-    @PostMapping("/selectByPage")
-    public Response selectByPage(@RequestBody TodoTaskRequest todoTaskRequest){
-       List<TodoTaskPojo>  todoTaskPojos =  todoTaskService.selectByPage(todoTaskRequest);
-       return Response.ok().data(todoTaskPojos);
+    @PostMapping("/selectByPageByCreate")
+    public Response selectByPageByCreate(@RequestBody TodoTaskRequest todoTaskRequest){
+        PageResultDTO<TodoTaskPojo> page=  todoTaskService.selectByPage(todoTaskRequest);
+       return Response.ok().data(page);
     }
     /**
-     * 通过责任人或填写人查询待办
+     * 查询用户待办或已办
      */
     @PostMapping("/selectByresPersonPage")
     public Response selectByresPersonPage(@RequestBody TodoTaskRequest todoTaskRequest){
diff --git a/src/main/java/com/xdap/self_development/controller/request/TodoTaskRequest.java b/src/main/java/com/xdap/self_development/controller/request/TodoTaskRequest.java
index 4862cd1..07128ea 100644
--- a/src/main/java/com/xdap/self_development/controller/request/TodoTaskRequest.java
+++ b/src/main/java/com/xdap/self_development/controller/request/TodoTaskRequest.java
@@ -17,7 +17,6 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Table("todo_task")
 public class TodoTaskRequest implements Serializable {
 
     /**
@@ -69,6 +68,10 @@ public class TodoTaskRequest implements Serializable {
      * 责任人或责任人ID
      */
     private String personId;
+    /**
+     *查询待办还是已办 0:待办  1：已办
+     */
+    private Integer isFinished;
 
     /**
      * 第几页
diff --git a/src/main/java/com/xdap/self_development/service/TodoTaskService.java b/src/main/java/com/xdap/self_development/service/TodoTaskService.java
index 3d809ea..25602d6 100644
--- a/src/main/java/com/xdap/self_development/service/TodoTaskService.java
+++ b/src/main/java/com/xdap/self_development/service/TodoTaskService.java
@@ -19,7 +19,7 @@ import java.util.List;
 public interface TodoTaskService  {
     void batchInsert(List<TodoTaskPojo> taskPojo);
 
-    List<TodoTaskPojo> selectByPage(TodoTaskRequest todoTaskRequest);
+    PageResultDTO<TodoTaskPojo> selectByPage(TodoTaskRequest todoTaskRequest);
     PageResultDTO<TodoTaskPojo>  selectByresPersonPage(TodoTaskRequest todoTaskRequest);
    void createResPerson(List<EngineParamDetailDTO> paramDetailPojos, String userID);
 
diff --git a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
index bbe410c..54acb17 100644
--- a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
@@ -55,11 +55,17 @@ public class TodoTaskServiceImpl implements TodoTaskService {
     }
 
     @Override
-    public List<TodoTaskPojo> selectByPage(TodoTaskRequest todoTaskRequest) {
-        List<TodoTaskPojo> todoTaskPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
+    public PageResultDTO<TodoTaskPojo> selectByPage(TodoTaskRequest todoTaskRequest) {
+        if (ObjectUtils.isEmpty(todoTaskRequest.getCreatedById())) {
+            throw new RuntimeException("请传入申请人");
+        }
+        PageResultDTO<TodoTaskPojo> todoTaskPojoPageResultDTO = new PageResultDTO<>();
+        PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("created_by_id", todoTaskRequest.getCreatedById())
-                .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class).getResult();
-        return todoTaskPojos;
+                .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
+        todoTaskPojoPageResultDTO.setList(queryResult.getResult());
+        todoTaskPojoPageResultDTO.setTotalCount(queryResult.getCount());
+        return todoTaskPojoPageResultDTO;
     }
 
     @Override
@@ -95,12 +101,16 @@ public class TodoTaskServiceImpl implements TodoTaskService {
 //                modelIds.add(detailPojo.getEngineModelId());
 //            }
 //        }
+        Integer dOrYTask = todoTaskRequest.getIsFinished();
+        if (dOrYTask != 0 && dOrYTask != 1) {
+            throw new RuntimeException("查询异常,联系管理员");
+        }
         PageResultDTO<TodoTaskPojo> pageResultDTO = new PageResultDTO<TodoTaskPojo>();
         PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("owner_id", todoTaskRequest.getPersonId())
-                .eq("is_delete", 0)
+                .eq("is_delete", dOrYTask)
                 .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
-        List<TodoTaskPojo> todoTaskPojos = queryResult.getResult() ;
+        List<TodoTaskPojo> todoTaskPojos = queryResult.getResult();
         pageResultDTO.setList(todoTaskPojos);
         pageResultDTO.setTotalCount(queryResult.getCount());
         return pageResultDTO;
@@ -165,7 +175,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
                     .eq("id", modelId)
                     .update("distribute_status", status)
                     .doUpdate(DataEntryEngineModelPojo.class);
-        }else{
+        } else {
             DistributeStatusEnum byDesc = DistributeStatusEnum.getByDesc("部分分发");
             Integer status = byDesc != null ? byDesc.getCode() : null;
             sw.buildFromDatasource("xdap_app_223770822127386625")