提交

backend/tests/test_oa_engine.py

@@ -502,7 +502,7 @@ class TestCompleteTaskOrSign(unittest.TestCase):
         # 已处理列表应能查到
         from app.services.oa_engine import list_tasks
 
-        done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
+        done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")["list"]
         self.assertEqual(len(done), 1)
         self.assertEqual(done[0]["status"], "approved")
 
@@ -1019,7 +1019,7 @@ class TestReturnAndResubmit(unittest.TestCase):
             return_task(
                 self.db, "t1", tenant_no="zkxw", user_id="u1", comment="请补充材料"
             )
-        done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
+        done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")["list"]
         self.assertEqual(len(done), 1)
         self.assertEqual(done[0]["status"], "returned")
 
@@ -1170,7 +1170,7 @@ class TestListTasksEnrichment(unittest.TestCase):
     def test_done_list_shows_instance_current_progress(self):
         from app.services.oa_engine import list_tasks
 
-        done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
+        done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")["list"]
         self.assertEqual(len(done), 1)
         row = done[0]
         self.assertEqual(row["appName"], "请假审批")
@@ -1184,7 +1184,7 @@ class TestListTasksEnrichment(unittest.TestCase):
     def test_mine_list_enrichment(self):
         from app.services.oa_engine import list_tasks
 
-        mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")
+        mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")["list"]
         self.assertEqual(len(mine), 1)
         row = mine[0]
         self.assertEqual(row["appName"], "请假审批")
@@ -1195,7 +1195,7 @@ class TestListTasksEnrichment(unittest.TestCase):
     def test_pending_list_enrichment(self):
         from app.services.oa_engine import list_tasks
 
-        pending = list_tasks(self.db, tenant_no="zkxw", user_id="u2", kind="pending")
+        pending = list_tasks(self.db, tenant_no="zkxw", user_id="u2", kind="pending")["list"]
         self.assertEqual(len(pending), 1)
         row = pending[0]
         self.assertEqual(row["appName"], "请假审批")
@@ -1219,7 +1219,7 @@ class TestListTasksEnrichment(unittest.TestCase):
                 pending.status = "cancelled"
                 self.db.commit()
 
-                mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")
+                mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")["list"]
                 row = mine[0]
                 self.assertEqual(row["instanceStatus"], status)
                 self.assertEqual(row["currentNodeName"], expected_label)
@@ -1429,7 +1429,7 @@ class TestTransferTask(unittest.TestCase):
         self.assertEqual(new_task.sign_mode, "and")
         self.assertEqual(new_task.node_key, "a1")
 
-        done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
+        done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")["list"]
         self.assertEqual(len(done), 1)
         self.assertEqual(done[0]["status"], "transferred")