diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php
index 3a40e7c..2e18936 100644
--- a/application/common/Model/Task.php
+++ b/application/common/Model/Task.php
@@ -293,6 +293,7 @@ class Task extends CommonModel
             Db::rollback();
             throw new \Exception($e->getMessage());
         }
+        unset($result['id']);
         return $result;
     }
 
diff --git a/application/common/Model/TaskStages.php b/application/common/Model/TaskStages.php
index 9fb16c7..d3d504a 100644
--- a/application/common/Model/TaskStages.php
+++ b/application/common/Model/TaskStages.php
@@ -24,9 +24,13 @@ class TaskStages extends CommonModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function tasks($stageCode, $deleted = 0)
+    public function tasks($stageCode, $deleted = 0, $done = -1)
     {
-        $list = Task::where(['stage_code' => $stageCode, 'pcode' => '', 'deleted' => $deleted])->order('sort asc,id asc')->field('id', true)->select();
+        $where = ['stage_code' => $stageCode, 'pcode' => '', 'deleted' => $deleted];
+        if ($done != -1) {
+            $where['done'] = $done;
+        }
+        $list = Task::where($where)->order('sort asc,id asc')->field('id', true)->select();
         if ($list) {
             foreach ($list as &$task) {
                 $task['executor'] = Member::where(['code' => $task['assign_to']])->field('name,avatar')->find();
diff --git a/application/project/controller/Task.php b/application/project/controller/Task.php
index af03481..3c4deb2 100644
--- a/application/project/controller/Task.php
+++ b/application/project/controller/Task.php
@@ -153,7 +153,7 @@ class Task extends BasicApi
             $this->error($e->getMessage(), $e->getCode());;
         }
         if ($result) {
-            $this->success();
+            $this->success('', $result);
         }
         $this->error("操作失败，请稍候再试！");
     }
diff --git a/application/project/controller/TaskStages.php b/application/project/controller/TaskStages.php
index 52b4309..fcc26bf 100644
--- a/application/project/controller/TaskStages.php
+++ b/application/project/controller/TaskStages.php
@@ -38,6 +38,8 @@ class TaskStages extends BasicApi
                 $item['fixedCreator'] = false; //添加任务按钮定位
                 $item['showTaskCard'] = false; //是否显示创建卡片
                 $item['tasks'] = [];
+                $item['doneTasks'] = [];
+                $item['unDoneTasks'] = [];
             }
         }
         $this->success('', $list);
@@ -52,11 +54,12 @@ class TaskStages extends BasicApi
     {
         $where = [];
         $code = Request::post('stageCode');
+        $done = Request::param('done', -1);
         if (!$code) {
             $this->error("数据解析异常");
         }
         $where[] = ['stage_code', '=', $code];
-        $list = $this->model->tasks($code);
+        $list = $this->model->tasks($code, 0, $done);
 //        $list = \app\common\Model\Task::alias('t')->join('member m','t.assign_to = m.code')->field()->where(['stage_code'=>$code])->select();
 
         $this->success('', $list);