From 1e65c36b18b13dca378ada295c3fd9d0bc484db5 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 20 May 2022 09:00:48 +0800
Subject: [PATCH] * Modify the kanban module test case.

---
 test/class/kanban.class.php            | 6 ++++--
 test/model/kanban/getimportedcards.php | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/class/kanban.class.php b/test/class/kanban.class.php
index a11899708a..a3bb5b49b7 100644
--- a/test/class/kanban.class.php
+++ b/test/class/kanban.class.php
@@ -519,10 +519,11 @@ class kanbanTest
      * @param  int    $kanbanID
      * @param  string $fromType
      * @param  int    $archived
+     * @param  int    $regionID
      * @access public
      * @return string
      */
-    public function getImportedCardsTest($kanbanID, $fromType, $archived = 0)
+    public function getImportedCardsTest($kanbanID, $fromType, $archived = 0, $regionID = 0)
     {
         global $tester;
         $cards = $tester->dao->select('*')->from(TABLE_KANBANCARD)
@@ -530,9 +531,10 @@ class kanbanTest
             ->andWhere('kanban')->eq($kanbanID)
             ->andWhere('archived')->eq($archived)
             ->andWhere('fromID')->eq(0)
+            ->beginIF($regionID)->andWhere('region')->eq($regionID)->fi()
             ->fetchAll('id');
 
-        $objects = $this->objectModel->getImportedCards($kanbanID, $cards, $fromType, $archived);
+        $objects = $this->objectModel->getImportedCards($kanbanID, $cards, $fromType, $archived, $regionID);
 
         if(dao::isError()) return dao::getError();
 
diff --git a/test/model/kanban/getimportedcards.php b/test/model/kanban/getimportedcards.php
index 800527d2b4..a655198b19 100755
--- a/test/model/kanban/getimportedcards.php
+++ b/test/model/kanban/getimportedcards.php
@@ -27,6 +27,7 @@ pid=1
 查看看板25的普通卡片和build卡片 >> ,193,194,195,196,197,198,199,200,993,994,995,996,997,998,999,1000
 查看看板25的普通卡片和productplan片 >> ,193,194,195,196,197,198,199,200
 查看看板1已归档的普通卡片和productplan卡片 >> ,6,7,8,801,802,803,804,805,806,807,808
+查看区域ID=1中看板1已归档的普通卡片和productplan卡片 >> ,6,7,8,801,802,803,804,805,806,807,808
 
 */
 
@@ -55,4 +56,5 @@ r($kanban->getImportedCardstest($kanbanIDList[7], $fromType[0])) && p() && e(',1
 global $tester;
 $tester->dao->update(TABLE_KANBANCARD)->set('archived')->eq(1)->where('id')->gt('5')->exec();
 r($kanban->getImportedCardsTest($kanbanIDList[0], $fromType[0], $archived)) && p() && e(',6,7,8,801,802,803,804,805,806,807,808');                 // 查看看板1已归档的普通卡片和productplan卡片
+r($kanban->getImportedCardsTest($kanbanIDList[0], $fromType[0], $archived, 1)) && p() && e(',6,7,8,801,802,803,804,805,806,807,808');              // 查看区域ID=1中看板1已归档的普通卡片和productplan卡片
 $tester->dao->update(TABLE_KANBANCARD)->set('archived')->eq(0)->where('id')->gt('5')->exec();