From 80cce4e58086c626fae902d9e0c1b3b5264a6cd1 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 4 Jan 2023 08:08:38 +0000
Subject: [PATCH 01/59]  * Finish task #82075.

---
 module/story/control.php |  5 +++--
 module/story/model.php   | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index 34fffa959d..f2616d8583 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1364,7 +1364,7 @@ class story extends control
         $buildApp   = $tab == 'product' ?   'project' : $tab;
         $releaseApp = $tab == 'execution' ? 'product' : $tab;
         $this->session->set('productList', $uri . "#app={$tab}", 'product');
-        if(!isonlybody())$this->session->set('buildList', $uri, $buildApp);
+        if(!isonlybody()) $this->session->set('buildList', $uri, $buildApp);
         $this->app->loadLang('bug');
 
         $storyID        = (int)$storyID;
@@ -1401,7 +1401,8 @@ class story extends control
         }
         elseif($from == 'project')
         {
-            $this->loadModel('project')->setMenu($this->session->project);
+            $projectID = (isset($story->projects[$this->session->project]) || empty($story->projects)) ? $this->session->project : key($story->projects);
+            $this->loadModel('project')->setMenu($projectID);
         }
         elseif($from == 'qa')
         {
diff --git a/module/story/model.php b/module/story/model.php
index 5be24f3135..c5ca0c99c9 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -47,13 +47,30 @@ class storyModel extends model
         if($setImgSize) $story->spec   = $this->file->setImgSize($story->spec);
         if($setImgSize) $story->verify = $this->file->setImgSize($story->verify);
 
-        $story->executions = $this->dao->select('t1.project, t2.name, t2.status, t2.type, t2.multiple')->from(TABLE_PROJECTSTORY)->alias('t1')
+        $projects = $this->dao->select('t1.project, t2.name, t2.status, t2.type, t2.multiple, t2.project AS parentProject')->from(TABLE_PROJECTSTORY)->alias('t1')
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project = t2.id')
-            ->where('t2.type')->in('sprint,stage,kanban')
+            ->where('t2.type')->in('sprint,stage,kanban,project')
             ->beginIF($story->twins)->andWhere('t1.story')->in(ltrim($story->twins, ',') . $story->id)
             ->beginIF(!$story->twins)->andWhere('t1.story')->in($story->id)
             ->orderBy('t1.`order` DESC')
             ->fetchAll('project');
+
+        $story->projects   = array();
+        $story->executions = array();
+        foreach($projects as $project)
+        {
+            if($project->type == 'project')
+            {
+                $story->projects[$project->project] = $project->project;
+            }
+            else
+            {
+                $story->executions[$project->project] = $project;
+
+                if(!$project->multiple) $story->projects[$project->parentProject] = $project->parentProject;
+            }
+        }
+
         $story->tasks  = $this->dao->select('id, name, assignedTo, execution, project, status, consumed, `left`,type')->from(TABLE_TASK)
             ->where('deleted')->eq(0)
             ->beginIF($story->twins)->andWhere('story')->in(ltrim($story->twins, ',') . $story->id)

From edb17bfdc76e1284d340480537481f125a593f57 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 10:44:51 +0800
Subject: [PATCH 02/59] * Add test of program model.

---
 test/class/program.class.php  |  4 ++--
 test/model/program/create.php | 33 +++++++++++++++++----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 83f491a8c3..dc67fe51eb 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -22,7 +22,7 @@ class programTest
      * @access public
      * @return object
      */
-    public function create($data)
+    public function createTest($data)
     {
         $_POST = $data;
 
@@ -30,7 +30,7 @@ class programTest
 
         if(dao::isError()) return array('message' => dao::getError());
 
-        $program = $this->program->getById($programID);
+        $program = $this->program->getByID($programID);
 
         return $program;
     }
diff --git a/test/model/program/create.php b/test/model/program/create.php
index de144c8745..9fd462eea3 100755
--- a/test/model/program/create.php
+++ b/test/model/program/create.php
@@ -2,25 +2,27 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
-$db->switchDB();
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1');
+$program->name->range('父项目集1');
+$program->type->range('program');
+$program->begin->range('2022-01-12');
+$program->end->range('2022-02-12');
+$program->gen(1);
+
+die;
+
 /**
 
 title=测试 programModel::create();
 cid=1
 pid=1
 
-创建新项目集 >> 测试新增项目集一
-项目集名称为空时 >> 『项目集名称』不能为空。
-项目集的开始时间为空 >> 『计划开始』不能为空。
-项目集的完成时间为空 >> 『计划完成』不能为空。
-项目集的计划完成时间大于计划开始时间 >> 『计划完成』应当大于『2022-01-12』。
-项目集的完成日期大于父项目集的完成日期(需要实时更新日期) >> 父项目集的开始日期：2022-01-16，开始日期不能小于父项目集的开始日期
-
 */
 
-$program = new programTest();
+$programTester = new programTest();
 
 $data = array(
     'parent'     => 0,
@@ -53,10 +55,9 @@ $moreThanParent['parent'] = '1';
 $moreThanParent['begin']  = '2018-01-01';
 $moreThanParent['end']    = '2022-02-10';
 
-r($program->create($normalProgram))     && p('name')                      && e('测试新增项目集一');                                                   // 创建新项目集
-r($program->create($emptyNameProgram))  && p('message[name]:0')           && e('『项目集名称』不能为空。');                                           // 项目集名称为空时
-r($program->create($emptyBeginProgram)) && p('message[begin]:0')          && e('『计划开始』不能为空。');                                             // 项目集的开始时间为空
-r($program->create($emptyEndProgram))   && p('message[end]:0')            && e('『计划完成』不能为空。');                                             // 项目集的完成时间为空
-r($program->create($beginGtEndProgram)) && p('message[end]:0')            && e('『计划完成』应当大于『2022-01-12』。');                               // 项目集的计划完成时间大于计划开始时间
-r($program->create($moreThanParent))    && p('message:begin;message:end') && e('父项目集的开始日期：2022-01-16，开始日期不能小于父项目集的开始日期'); // 项目集的完成日期大于父项目集的完成日期(需要实时更新日期)
-$db->restoreDB();
\ No newline at end of file
+r($programTester->createTest($normalProgram))     && p('name')                      && e('测试新增项目集一');                                                   // 创建新项目集
+r($programTester->createTest($emptyNameProgram))  && p('message[name]:0')           && e('『项目集名称』不能为空。');                                           // 项目集名称为空时
+r($programTester->createTest($emptyBeginProgram)) && p('message[begin]:0')          && e('『计划开始』不能为空。');                                             // 项目集的开始时间为空
+r($programTester->createTest($emptyEndProgram))   && p('message[end]:0')            && e('『计划完成』不能为空。');                                             // 项目集的完成时间为空
+r($programTester->createTest($beginGtEndProgram)) && p('message[end]:0')            && e('『计划完成』应当大于『2022-01-12』。');                               // 『计划完成』应当大于『2022-01-12』。
+r($programTester->createTest($moreThanParent))    && p('message:begin;message:end') && e('父项目集的开始日期：2022-01-16，开始日期不能小于父项目集的开始日期'); // 项目集的完成日期大于父项目集的完成日期(需要实时更新日期)

From f8df2cd571239e6f89d6651ad23f623c822e2e20 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 5 Jan 2023 03:05:51 +0000
Subject: [PATCH 03/59]  * Finish task #82073.

---
 module/bug/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 64fb3747d1..c4ebe96f61 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -863,7 +863,7 @@ class bugModel extends model
 
                 if($bug->assignedTo != $oldBug->assignedTo) $bug->assignedDate = $now;
                 if($bug->resolution != '') $bug->confirmed = 1;
-                if(($bug->resolvedBy != '' or $bug->resolution != '') and $oldBug->status != 'closed')
+                if(($bug->resolvedBy != '' or $bug->resolution != '') and strpos(',resolved,closed,', ",{$oldBug->status},") === false)
                 {
                     $bug->resolvedDate = $now;
                     $bug->status       = 'resolved';

From 21c5ddefcc49909611f423514214562356eb8b3a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 11:10:04 +0800
Subject: [PATCH 04/59] * Modify program create test case.

---
 test/model/program/create.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/test/model/program/create.php b/test/model/program/create.php
index 9fd462eea3..a2d6fb0b5c 100755
--- a/test/model/program/create.php
+++ b/test/model/program/create.php
@@ -8,18 +8,23 @@ $program = zdTable('project');
 $program->id->range('1');
 $program->name->range('父项目集1');
 $program->type->range('program');
-$program->begin->range('2022-01-12');
-$program->end->range('2022-02-12');
+$program->path->range('1')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
 $program->gen(1);
 
-die;
-
 /**
 
 title=测试 programModel::create();
 cid=1
 pid=1
 
+创建新项目集                         >> 测试新增项目集一
+项目集名称为空时                     >> 『项目集名称』不能为空。
+项目集的开始时间为空                 >> 『计划开始』不能为空。
+项目集的完成时间为空                 >> 『计划完成』不能为空。
+『计划完成』应当大于『2022-01-12』。 >> 『计划完成』应当大于『2022-01-12』。
+
 */
 
 $programTester = new programTest();
@@ -27,7 +32,7 @@ $programTester = new programTest();
 $data = array(
     'parent'     => 0,
     'name'       => '测试新增项目集一',
-    'budget'     => '', 
+    'budget'     => '',
     'budgetUnit' => 'CNY',
     'begin'      => '2022-01-12',
     'end'        => '2022-02-12',
@@ -50,14 +55,8 @@ $emptyEndProgram['end'] = '';
 $beginGtEndProgram = $data;
 $beginGtEndProgram['end'] = '2022-01-10';
 
-$moreThanParent = $data;
-$moreThanParent['parent'] = '1';
-$moreThanParent['begin']  = '2018-01-01';
-$moreThanParent['end']    = '2022-02-10';
-
-r($programTester->createTest($normalProgram))     && p('name')                      && e('测试新增项目集一');                                                   // 创建新项目集
-r($programTester->createTest($emptyNameProgram))  && p('message[name]:0')           && e('『项目集名称』不能为空。');                                           // 项目集名称为空时
-r($programTester->createTest($emptyBeginProgram)) && p('message[begin]:0')          && e('『计划开始』不能为空。');                                             // 项目集的开始时间为空
-r($programTester->createTest($emptyEndProgram))   && p('message[end]:0')            && e('『计划完成』不能为空。');                                             // 项目集的完成时间为空
-r($programTester->createTest($beginGtEndProgram)) && p('message[end]:0')            && e('『计划完成』应当大于『2022-01-12』。');                               // 『计划完成』应当大于『2022-01-12』。
-r($programTester->createTest($moreThanParent))    && p('message:begin;message:end') && e('父项目集的开始日期：2022-01-16，开始日期不能小于父项目集的开始日期'); // 项目集的完成日期大于父项目集的完成日期(需要实时更新日期)
+r($programTester->createTest($normalProgram))     && p('name')             && e('测试新增项目集一');                     // 创建新项目集
+r($programTester->createTest($emptyNameProgram))  && p('message[name]:0')  && e('『项目集名称』不能为空。');             // 项目集名称为空时
+r($programTester->createTest($emptyBeginProgram)) && p('message[begin]:0') && e('『计划开始』不能为空。');               // 项目集的开始时间为空
+r($programTester->createTest($emptyEndProgram))   && p('message[end]:0')   && e('『计划完成』不能为空。');               // 项目集的完成时间为空
+r($programTester->createTest($beginGtEndProgram)) && p('message[end]:0')   && e('『计划完成』应当大于『2022-01-12』。'); // 『计划完成』应当大于『2022-01-12』。

From 682d97e9f52414f2aabd0d757603513f739eb008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 11:20:15 +0800
Subject: [PATCH 05/59] * Add test of program model.

---
 test/class/program.class.php                | 11 +++++-----
 test/model/program/createdefaultprogram.php | 11 ++++------
 test/model/program/createstakeholder.php    | 23 +++++++++++++--------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index dc67fe51eb..b581982738 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -36,15 +36,16 @@ class programTest
     }
 
     /**
-     * createStakeholder
+     * Create stakeholder.
      *
-     * @param  int    mixed $programID
+     * @param  int    $programID
+     * @param  array  $accounts
      * @access public
      * @return void
      */
-    public function createStakeholder($programID)
+    public function createStakeholderTest($programID, $accounts = array())
     {
-        $_POST['accounts'] = array('dev1', 'dev2');
+        $_POST['accounts'] = $accounts;
         $stakeHolder = $this->program->createStakeholder($programID);
 
         return $this->program->getStakeholdersByPrograms($programID);
@@ -60,7 +61,7 @@ class programTest
     {
         $programID = $this->program->createDefaultProgram();
 
-        return $programID;
+        return $programID > 0;
     }
 
     /**
diff --git a/test/model/program/createdefaultprogram.php b/test/model/program/createdefaultprogram.php
index 136076867e..14270abcf7 100644
--- a/test/model/program/createdefaultprogram.php
+++ b/test/model/program/createdefaultprogram.php
@@ -2,7 +2,6 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
-$db->switchDB();
 
 /**
 
@@ -10,14 +9,12 @@ title=测试 programModel::createDefaultProgram();
 cid=1
 pid=1
 
-创建默认项目集并返回ID >> 751
+创建默认项目集 >> 1
 
 */
 
-$test = new programTest();
+$programTester = new programTest();
 
-$result = $test->createDefaultProgramTest();
+$result = $programTester->createDefaultProgramTest();
 
-r($result) && p('') && e('751'); // 创建默认项目集并返回ID
-
-$db->restoreDB();
\ No newline at end of file
+r($result) && p('') && e('1'); // 创建默认项目集
diff --git a/test/model/program/createstakeholder.php b/test/model/program/createstakeholder.php
index 26d773a962..115e695ee9 100755
--- a/test/model/program/createstakeholder.php
+++ b/test/model/program/createstakeholder.php
@@ -2,7 +2,15 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
-$db->switchDB();
+
+$program = zdTable('project');
+$program->id->range('1');
+$program->name->range('父项目集1');
+$program->type->range('program');
+$program->path->range('1')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(1);
 
 /**
 
@@ -11,17 +19,14 @@ cid=1
 pid=1
 
 创建id=1的项目集的干系人并查看数量。 >> 2
-创建id=1的项目集的干系人dev1,dev2并查看Account。 >> dev2;dev1
+创建id=1的项目集的干系人dev1,dev2并查看Account。 >> dev1;dev2
 
 */
 
-global $tester;
-$tester->loadModel('program');
+$programTester = new programTest();
 
-$_POST['accounts'] = array('dev1', 'dev2');
-$tester->program->createStakeholder(1);
-$result = $tester->program->getStakeholdersByPrograms(1);
+$accounts = array('dev1', 'dev2');
+$result   = $programTester->createStakeholderTest(1, $accounts);
 
 r(count($result)) && p('')                    && e('2');         // 创建id=1的项目集的干系人并查看数量。
-r($result)        && p('0:account;1:account') && e('dev2;dev1'); // 创建id=1的项目集的干系人dev1,dev2并查看Account。
-$db->restoreDB();
\ No newline at end of file
+r($result)        && p('0:account;1:account') && e('dev1;dev2'); // 创建id=1的项目集的干系人dev1,dev2并查看Account。

From 6e02dc58ea0c48635156c9e5916c7bbc325bd4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 11:30:15 +0800
Subject: [PATCH 06/59] * Add test of program model.

---
 test/class/program.class.php         | 17 +++++++++++++++++
 test/model/program/getbudgetleft.php | 28 ++++++++++++++++++----------
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index b581982738..baad2a2e70 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -117,4 +117,21 @@ class programTest
 
         return $program;
     }
+
+    /**
+     * Get budget left.
+     *
+     * @param  int    $programID
+     * @access public
+     * @return int
+     */
+    public function getBudgetLeftTest($programID)
+    {
+        $program = $this->program->getByID($programID);
+        $budget  = $this->program->getBudgetLeft($program);
+
+        if(dao::isError()) return array('message' => dao::getError());
+
+        return $budget;
+    }
 }
diff --git a/test/model/program/getbudgetleft.php b/test/model/program/getbudgetleft.php
index 066cf1789f..4db0a00893 100755
--- a/test/model/program/getbudgetleft.php
+++ b/test/model/program/getbudgetleft.php
@@ -1,25 +1,33 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1,2');
+$program->name->range('父项目集1,父项目集2');
+$program->type->range('program');
+$program->budget->range('900000,899900');
+$program->path->range('1,2')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(2);
+
 /**
 
 title=测试 programModel::getBudgetLeft();
 cid=1
 pid=1
 
-查看项目11的所有父项目集的预算剩余 >> 900000
-查看项目12的所有父项目集的预算剩余 >> 899900
+查看项目集1的所有父项目集的预算剩余 >> 900000
+查看项目集2的所有父项目集的预算剩余 >> 899900
 
 */
 
-global $tester;
-$tester->loadModel('program');
-$program1 = $tester->program->getById(11);
-$program2 = $tester->program->getById(12);
-$result1  = $tester->program->getBudgetLeft($program1);
-$result2  = $tester->program->getBudgetLeft($program2);
+$programTester = new programTest();
+$result1  = $programTester->getBudgetLeftTest(1);
+$result2  = $programTester->getBudgetLeftTest(2);
 
-r($result) && p() && e('900000');  // 查看项目11的所有父项目集的预算剩余
-r($result) && p() && e('899900');  // 查看项目12的所有父项目集的预算剩余
\ No newline at end of file
+r($result1) && p() && e('900000');  // 查看项目集1的所有父项目集的预算剩余
+r($result2) && p() && e('899900');  // 查看项目集2的所有父项目集的预算剩余

From 592aeee6cd506efee8d439d873ce2025a518998f Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 13:11:39 +0800
Subject: [PATCH 07/59] * Modify program udpdate test case.

---
 test/class/program.class.php  |  4 ++--
 test/model/program/update.php | 44 +++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index baad2a2e70..4551f246e7 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -87,14 +87,14 @@ class programTest
 
 
     /**
-     * update
+     * Test update program.
      *
      * @param  mixed  $proguamID
      * @param  mixed  $data
      * @access public
      * @return void
      */
-    public function update($programID, $data)
+    public function updateTest($programID, $data)
     {
         $_POST = $data;
         $this->program->update($programID);
diff --git a/test/model/program/update.php b/test/model/program/update.php
index 62037da4ae..6254c65887 100755
--- a/test/model/program/update.php
+++ b/test/model/program/update.php
@@ -2,16 +2,24 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
-$db->switchDB();
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1');
+$program->name->range('项目集1');
+$program->type->range('program');
+$program->path->range('1')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(1);
+
 /**
 
 title=测试 programModel::update();
 cid=1
 pid=1
 
-正常更新项目集的情况 >> 测试更新项目集十
+正常更新项目集的情况 >> 测试更新项目集
 更新项目集名称为空时 >> 『项目集名称』不能为空。
 当计划开始为空时更新项目集信息 >> 『计划开始』不能为空。
 当计划完成为空时更新项目集信息 >> 『计划完成』不能为空。
@@ -19,19 +27,20 @@ pid=1
 
 */
 
-$program = new programTest();
+$programTester = new programTest();
 
 $data = array(
-    'parent' => '0',
-    'name' => '测试更新项目集十',
-    'begin' => '2020-10-10',
-    'end' => '2022-09-03',
-    'acl' => 'private',
-    'budget' => '100',
-    'budgetUnit' => 'CNY',
-    'syncPRJUnit' => true,
+    'parent'       => '0',
+    'name'         => '测试更新项目集',
+    'begin'        => '2020-10-10',
+    'end'          => '2023-09-03',
+    'acl'          => 'private',
+    'budget'       => '100',
+    'status'       => 'wait',
+    'budgetUnit'   => 'CNY',
+    'syncPRJUnit'  => true,
     'exchangeRate' => '',
-    'whitelist' => array('dev10', 'dev12')
+    'whitelist'    => array('dev10', 'dev12')
 );
 
 $normalProgram = $data;
@@ -48,9 +57,8 @@ $emptyEndProgram['end'] = '';
 $realBeganProgram = $data;
 $realBeganProgram['realBegan'] = '2020-11-10';
 
-r($program->update(10, $normalProgram))      && p('name')              && e('测试更新项目集十');         // 正常更新项目集的情况
-r($program->update(10, $emptyTitleProgram))  && p('message[name]:0')   && e('『项目集名称』不能为空。'); // 更新项目集名称为空时
-r($program->update(10, $emptyBeginProgram))  && p('message[begin]:0')  && e('『计划开始』不能为空。');   // 当计划开始为空时更新项目集信息
-r($program->update(10, $emptyEndProgram))    && p('message[end]:0')       && e('『计划完成』不能为空。');   // 当计划完成为空时更新项目集信息
-r($program->update(10, $realBeganProgram))   && p('status')            && e('doing');                    // 更新未开始的项目集实际开始时间
-$db->restoreDB();
+r($programTester->updateTest(1, $normalProgram))      && p('name')              && e('测试更新项目集');           // 正常更新项目集的情况
+r($programTester->updateTest(1, $emptyTitleProgram))  && p('message[name]:0')   && e('『项目集名称』不能为空。'); // 更新项目集名称为空时
+r($programTester->updateTest(1, $emptyBeginProgram))  && p('message[begin]:0')  && e('『计划开始』不能为空。');   // 当计划开始为空时更新项目集信息
+r($programTester->updateTest(1, $emptyEndProgram))    && p('message[end]:0')    && e('『计划完成』不能为空。');   // 当计划完成为空时更新项目集信息
+r($programTester->updateTest(1, $realBeganProgram))   && p('status')            && e('doing');                    // 更新未开始的项目集实际开始时间

From e9f88d3cbd476c6b40336c5b9252d1f733fb1922 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 5 Jan 2023 13:59:41 +0800
Subject: [PATCH 08/59] * Fix code error.

---
 module/execution/control.php | 9 ++++++---
 module/tutorial/model.php    | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index bb833b35e9..bdb1bbff66 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1760,10 +1760,13 @@ class execution extends control
             foreach($products as $productIndex => $product)
             {
                 $productPlans[$productIndex] = array();
-                foreach($branches[$productIndex] as $branchID => $branch)
+                if(isset($branches[$productIndex]))
                 {
-                    $linkedBranches[$productIndex][$branchID] = $branchID;
-                    $productPlans[$productIndex] += isset($plans[$productIndex][$branchID]) ? $plans[$productIndex][$branchID] : array();
+                    foreach($branches[$productIndex] as $branchID => $branch)
+                    {
+                        $linkedBranches[$productIndex][$branchID] = $branchID;
+                        $productPlans[$productIndex] += isset($plans[$productIndex][$branchID]) ? $plans[$productIndex][$branchID] : array();
+                    }
                 }
             }
 
diff --git a/module/tutorial/model.php b/module/tutorial/model.php
index 41f2bc8358..d2b0a8b723 100644
--- a/module/tutorial/model.php
+++ b/module/tutorial/model.php
@@ -168,6 +168,7 @@ class tutorialModel extends model
         $project->deleted      = '0';
         $project->hasProduct   = '';
         $project->multiple     = '';
+        $project->division     = 0;
 
         return $project;
     }

From 71c7124fd7633a0e76004405809596e864229b4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 13:59:55 +0800
Subject: [PATCH 09/59] * Add case for program model.

---
 test/class/program.class.php             | 12 ++++++++++++
 test/model/program/getbudgetunitlist.php | 19 ------------------
 test/model/program/getchildren.php       | 25 ++++++++++++++++--------
 3 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100755 test/model/program/getbudgetunitlist.php

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 4551f246e7..36434cf37d 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -134,4 +134,16 @@ class programTest
 
         return $budget;
     }
+
+    /**
+     * Get children.
+     *
+     * @param  int    $programID
+     * @access public
+     * @return int
+     */
+    public function getChildrenTest($programID)
+    {
+        return $this->program->getChildren($programID);
+    }
 }
diff --git a/test/model/program/getbudgetunitlist.php b/test/model/program/getbudgetunitlist.php
deleted file mode 100755
index 367aa5677d..0000000000
--- a/test/model/program/getbudgetunitlist.php
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
-su('admin');
-
-/**
-
-title=测试 programModel::getBudgetUnitList();
-cid=1
-pid=1
-
-获取货币类型列表 >> 人民币;美元
-
-*/
-
-global $tester;
-$tester->loadModel('project');
-
-r($tester->loadModel('program')->getBudgetUnitList()) && p('CNY;USD') && e('人民币;美元'); //获取货币类型列表
\ No newline at end of file
diff --git a/test/model/program/getchildren.php b/test/model/program/getchildren.php
index 61f6bb3ef8..d22267f467 100755
--- a/test/model/program/getchildren.php
+++ b/test/model/program/getchildren.php
@@ -1,23 +1,32 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-3');
+$program->name->range('父项目集1,子项目集1,子项目集2');
+$program->parent->range('0,1,1');
+$program->type->range('program');
+$program->path->setFields(array(
+    array('field' => 'path1', 'range' => '1', 'prefix' => ',', 'postfix' => ','),
+    array('field' => 'path2', 'range' => '[],2,3', 'postfix' => ',')
+));
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(3);
+
 /**
 
 title=测试 programModel:: getChildren();
 cid=1
 pid=1
 
-通过id查找id=1的子项目集个数 >> 9
-通过id查找id=22的子项目集个数 >> 7
-通过id查找id=221的子项目集个数 >> 0
+通过id查找id=1的子项目集个数 >> 2
 
 */
 
-global $tester;
-$tester->loadModel('program');
+$programTester = new programTest();
 
-r($tester->program->getChildren(1))   && p() && e('9'); // 通过id查找id=1的子项目集个数
-r($tester->program->getChildren(22))  && p() && e('7'); // 通过id查找id=22的子项目集个数
-r($tester->program->getChildren(221)) && p() && e('0'); // 通过id查找id=221的子项目集个数
\ No newline at end of file
+r($programTester->getChildrenTest(1)) && p() && e('2'); // 通过id查找id=1的子项目集个数

From 4ecf2050240da0e16892fe828a03d88dd9864304 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 14:07:45 +0800
Subject: [PATCH 10/59] * Update test case for program settreepath.

---
 test/class/program.class.php       | 15 +++++++++++++++
 test/lib/yaml.class.php            |  8 ++++----
 test/model/program/settreepath.php | 28 ++++++++++++++++++----------
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 4551f246e7..20cb41b8e4 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -134,4 +134,19 @@ class programTest
 
         return $budget;
     }
+
+    /**
+     * Set tree path.
+     *
+     * @param  int    $programID
+     * @access public
+     * @return void
+     */
+    public function setTreePathTest($programID)
+    {
+        $this->program->setTreePath($programID);
+        $program = $this->program->getByID($programID);
+
+        return $program;
+    }
 }
diff --git a/test/lib/yaml.class.php b/test/lib/yaml.class.php
index 2ce3f4ad97..a43dc5e9af 100644
--- a/test/lib/yaml.class.php
+++ b/test/lib/yaml.class.php
@@ -257,7 +257,7 @@ class yaml
      * @access public
      * @return void
      */
-    public function gen($rows, $version = '')
+    public function gen($rows, $version = '1.0')
     {
         $runFileDir  = dirname(getcwd() . DS . $_SERVER['SCRIPT_FILENAME']);
         $runFileName = str_replace(strrchr($_SERVER['SCRIPT_FILENAME'], "."), "", $_SERVER['SCRIPT_FILENAME']);
@@ -268,9 +268,9 @@ class yaml
 
         $yamlDataArr = array();
 
-        $yamlDataArr['title']  = "zt_{$this->tableName}";
-        $yamlDataArr['author'] = "auto_{$runFileName}";
-        $version ? $yamlDataArr['version'] = $version : $yamlDataArr['version'] = '1.0';
+        $yamlDataArr['title']   = "zt_{$this->tableName}";
+        $yamlDataArr['author']  = "auto_{$runFileName}";
+        $yamlDataArr['version'] = $version;
 
         if(empty($this->fields->fieldArr))
         {
diff --git a/test/model/program/settreepath.php b/test/model/program/settreepath.php
index 689014342c..76b79722ac 100755
--- a/test/model/program/settreepath.php
+++ b/test/model/program/settreepath.php
@@ -1,26 +1,34 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1,10');
+$program->name->range('项目集1');
+$program->type->range('program');
+$program->parent->range('[],[1]');
+$program->path->range('1,10')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(2);
+
 /**
 
 title=测试 programModel::setTreePath();
 cid=1
 pid=1
 
-设置之前的项目集的path >> ,2,12,
-设置之后的项目集的path >> ,2,12,
+设置之前的项目集的path >> ,10,
+设置之后的项目集的path >> ,1,10,
 
 */
 
-global $tester;
-$tester->loadModel('program');
+$programTester = new programTest();
 
-$before = $tester->program->getById(12);
-$tester->program->setTreePath(12);
-$after  = $tester->program->getById(12);
+$before = $programTester->getByIDTest(10);
+$after  = $programTester->setTreePathTest(10);
 
-r($before) && p('path') && e(',2,12,'); // 设置之前的项目集的path
-r($after)  && p('path') && e(',2,12,'); // 设置之后的项目集的path
-$db->restoreDB();
\ No newline at end of file
+r($before) && p('path') && e(',10,');   // 设置之前的项目集的path
+r($after)  && p('path') && e(',1,10,'); // 设置之后的项目集的path

From 3090e4fbbae87f2bc916463045c378b64400e90f Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 14:19:38 +0800
Subject: [PATCH 11/59] * Update test case for isclickable.

---
 test/class/program.class.php       | 13 +++++++++++
 test/model/program/isclickable.php | 37 +++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 3d27b86e9e..c65d29e731 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -161,4 +161,17 @@ class programTest
     {
         return $this->program->getChildren($programID);
     }
+
+    /**
+     * Check clickable.
+     *
+     * @param  int    $programID
+     * @param  string $status
+     * @access public
+     * @return int
+     */
+    public function isClickableTest($programID, $status)
+    {
+        return $this->program->isClickable($programID, $status);
+    }
 }
diff --git a/test/model/program/isclickable.php b/test/model/program/isclickable.php
index 3d8904c401..75c9f3c4f4 100755
--- a/test/model/program/isclickable.php
+++ b/test/model/program/isclickable.php
@@ -2,6 +2,18 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+su('admin');
+
+$program = zdTable('project');
+$program->id->range('1,2');
+$program->name->range('项目集1,项目集2');
+$program->type->range('program');
+$program->status->range('wait');
+$program->parent->range('0');
+$program->path->range('1,2')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(2);
 
 /**
 
@@ -9,24 +21,23 @@ title=测试 programModel::createStakeholder();
 cid=1
 pid=1
 
-传入项目集1，动作为closed，判断是否可点击 >> 1
+传入项目集1，动作为closed，判断是否可点击   >> 1
 传入项目集1，动作为activate，判断是否可点击 >> 0
-传入项目集1，动作为suspend，判断是否可点击 >> 1
-传入项目集2，动作为closed，判断是否可点击 >> 1
+传入项目集1，动作为suspend，判断是否可点击  >> 1
+传入项目集2，动作为closed，判断是否可点击   >> 1
 传入项目集2，动作为activate，判断是否可点击 >> 0
 传入项目集2，动作为activate，判断是否可点击 >> 1
 
 */
 
-global $tester;
-$tester->loadModel('program');
+$programTester = new programTest();
 
-$program1 = $tester->program->getById(1);
-$program2 = $tester->program->getById(2);
+$program1 = $programTester->getByIDTest(1);
+$program2 = $programTester->getByIDTest(2);
 
-r($tester->program->isClickable($program1, 'close'))    && p('') && e('1'); // 传入项目集1，动作为closed，判断是否可点击
-r($tester->program->isClickable($program1, 'activate')) && p('') && e('0'); // 传入项目集1，动作为activate，判断是否可点击
-r($tester->program->isClickable($program1, 'suspend'))  && p('') && e('1'); // 传入项目集1，动作为suspend，判断是否可点击
-r($tester->program->isClickable($program2, 'close'))    && p('') && e('1'); // 传入项目集2，动作为closed，判断是否可点击
-r($tester->program->isClickable($program2, 'activate')) && p('') && e('0'); // 传入项目集2，动作为activate，判断是否可点击
-r($tester->program->isClickable($program2, 'suspend'))  && p('') && e('1'); // 传入项目集2，动作为activate，判断是否可点击
\ No newline at end of file
+r($programTester->isClickableTest($program1, 'close'))    && p('') && e('1'); // 传入项目集1，动作为closed，判断是否可点击
+r($programTester->isClickableTest($program1, 'activate')) && p('') && e('0'); // 传入项目集1，动作为activate，判断是否可点击
+r($programTester->isClickableTest($program1, 'suspend'))  && p('') && e('1'); // 传入项目集1，动作为suspend，判断是否可点击
+r($programTester->isClickableTest($program2, 'close'))    && p('') && e('1'); // 传入项目集2，动作为closed，判断是否可点击
+r($programTester->isClickableTest($program2, 'activate')) && p('') && e('0'); // 传入项目集2，动作为activate，判断是否可点击
+r($programTester->isClickableTest($program2, 'suspend'))  && p('') && e('1'); // 传入项目集2，动作为activate，判断是否可点击

From af9a2f108cac9ce96d2d3d887a72d85313dd44cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 14:21:53 +0800
Subject: [PATCH 12/59] * Add case for program model.

---
 test/class/program.class.php               | 12 ++++++++
 test/model/program/getchildren.php         |  6 ++--
 test/model/program/getinvolvedprograms.php | 33 ++++++++++++++--------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index c65d29e731..27412bcd18 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -174,4 +174,16 @@ class programTest
     {
         return $this->program->isClickable($programID, $status);
     }
+
+    /**
+     * get involved programs.
+     *
+     * @param  string $account 
+     * @access public
+     * @return array
+     */
+    public function getInvolvedProgramsTest($account)
+    {
+        return $this->program->getInvolvedPrograms($account);
+    }
 }
diff --git a/test/model/program/getchildren.php b/test/model/program/getchildren.php
index d22267f467..19605353f6 100755
--- a/test/model/program/getchildren.php
+++ b/test/model/program/getchildren.php
@@ -8,11 +8,9 @@ $program = zdTable('project');
 $program->id->range('1-3');
 $program->name->range('父项目集1,子项目集1,子项目集2');
 $program->parent->range('0,1,1');
+$program->grade->range('1,2,2');
 $program->type->range('program');
-$program->path->setFields(array(
-    array('field' => 'path1', 'range' => '1', 'prefix' => ',', 'postfix' => ','),
-    array('field' => 'path2', 'range' => '[],2,3', 'postfix' => ',')
-));
+$program->path->range('`,1,`,`,1,2,`,`,1,3,`');
 $program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
 $program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
 $program->gen(3);
diff --git a/test/model/program/getinvolvedprograms.php b/test/model/program/getinvolvedprograms.php
index e593aaf7d8..7f5bc688d6 100755
--- a/test/model/program/getinvolvedprograms.php
+++ b/test/model/program/getinvolvedprograms.php
@@ -1,8 +1,20 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-3');
+$program->name->range('1-3')->prefix('项目集');
+$program->type->range('program');
+$program->path->range('1-3')->prefix(',')->postfix(',');
+$program->grade->range('1');
+$program->openedBy->range('admin,test1');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(3);
+
 /**
 
 title=测试 programModel::getInvolvedPrograms();
@@ -10,18 +22,17 @@ cid=1
 pid=1
 
 获取admin参与的项目集数量 >> 2
-获取test2参与的项目集数量 >> 1
-获取admin参与的项目集ID >> 10
-获取test2参与的项目集ID >> 1
+获取test1参与的项目集数量 >> 1
+获取admin参与的项目集ID >> 1
+获取test1参与的项目集ID >> 2
 
 */
 
-global $tester;
-$tester->loadModel('program');
-$adminPrograms = $tester->program->getInvolvedPrograms('admin');
-$test2Programs = $tester->program->getInvolvedPrograms('test2');
+$programTester = new programTest();
+$adminPrograms = $programTester->getInvolvedProgramsTest('admin');
+$test1Programs = $programTester->getInvolvedProgramsTest('test1');
 
-r(count($adminPrograms)) && p()     && e('2');  // 获取admin参与的项目集数量
-r(count($test2Programs)) && p()     && e('1');  // 获取test2参与的项目集数量
-r($adminPrograms)        && p('10') && e('10'); // 获取admin参与的项目集ID
-r($test2Programs)        && p('1')  && e('1');  // 获取test2参与的项目集ID
\ No newline at end of file
+r(count($adminPrograms)) && p()    && e('2'); // 获取admin参与的项目集数量
+r(count($test1Programs)) && p()    && e('1'); // 获取test1参与的项目集数量
+r($adminPrograms)        && p('1') && e('1'); // 获取admin参与的项目集ID
+r($test1Programs)        && p('2') && e('2'); // 获取test1参与的项目集ID

From 3a8c6ac3410636ea8bc120e85d22e77f24415125 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 14:27:00 +0800
Subject: [PATCH 13/59] * Update test case for hasunfinished.

---
 test/class/program.class.php         | 13 +++++++++++++
 test/model/program/hasunfinished.php | 25 +++++++++++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index c65d29e731..3500eddca9 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -174,4 +174,17 @@ class programTest
     {
         return $this->program->isClickable($programID, $status);
     }
+
+    /**
+     * Has unfinished.
+     *
+     * @param  int    $programID
+     * @access public
+     * @return int
+     */
+    public function hasUnfinishedTest($programID)
+    {
+        $program = $this->program->getByID($programID);
+        return $this->program->hasUnfinished($program);
+    }
 }
diff --git a/test/model/program/hasunfinished.php b/test/model/program/hasunfinished.php
index 5a1cd2665c..ee4c1e7aa0 100755
--- a/test/model/program/hasunfinished.php
+++ b/test/model/program/hasunfinished.php
@@ -1,23 +1,32 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-5');
+$program->name->range('项目集1,项目集2');
+$program->type->range('program');
+$program->status->range('wait');
+$program->parent->range('0,0,1,1,2');
+$program->path->range('1,2,`1,3`,`1,4`,`2,5`')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(5);
+
 /**
 
 title=测试 programModel::hasUnfinished();
 cid=1
 pid=1
 
-获取项目集1下未完成的项目和项目集数量 >> 9
-获取项目集2下未完成的项目和项目集数量 >> 7
+获取项目集1下未完成的项目和项目集数量 >> 2
+获取项目集2下未完成的项目和项目集数量 >> 1
 
 */
 
-global $tester;
-$tester->loadModel('program');
-$program1 = $tester->program->getById(1);
-$program2 = $tester->program->getById(2);
+$programTester = new programTest();
 
-r($tester->program->hasUnfinished($program1)) && p() && e('9'); // 获取项目集1下未完成的项目和项目集数量
-r($tester->program->hasUnfinished($program2)) && p() && e('7'); // 获取项目集2下未完成的项目和项目集数量
\ No newline at end of file
+r($programTester->hasUnfinishedTest(1)) && p() && e('2'); // 获取项目集1下未完成的项目和项目集数量
+r($programTester->hasUnfinishedTest(2)) && p() && e('1'); // 获取项目集2下未完成的项目和项目集数量

From ccbfbcf1d2ee3d3a5bf3b180dbb918ccb6faf660 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 14:37:35 +0800
Subject: [PATCH 14/59] * Test case for gettreemenu.

---
 test/class/program.class.php       | 12 ++++++++++++
 test/model/program/gettreemenu.php | 23 +++++++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index eea5e51baf..f223f5bce5 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -199,4 +199,16 @@ class programTest
     {
         return $this->program->getInvolvedPrograms($account);
     }
+
+    /*
+     * Get Tree menu.
+     *
+     * @param  string $programID
+     * @access public
+     * @return array
+     */
+    public function getTreeMenuTest($programID)
+    {
+        return $this->program->getTreeMenu($programID);
+    }
 }
diff --git a/test/model/program/gettreemenu.php b/test/model/program/gettreemenu.php
index f73d77e4e4..e9a4504fc4 100755
--- a/test/model/program/gettreemenu.php
+++ b/test/model/program/gettreemenu.php
@@ -1,6 +1,19 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+su('admin');
+
+$program = zdTable('project');
+$program->id->range('1-5');
+$program->name->range('项目集1,项目集2');
+$program->type->range('program');
+$program->status->range('wait');
+$program->parent->range('0,0,1,1,2');
+$program->path->range('1,2,`1,3`,`1,4`,`2,5`')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(5);
 
 /**
 
@@ -8,12 +21,10 @@ title=测试 programModel::getTreeMenu();
 cid=1
 pid=1
 
-查看返回的字符个数 >> 789
+查看返回的字符个数 >> 396
 
 */
+$programTester = new programTest();
+$programs1 = $programTester->getTreeMenuTest(1);
 
-global $tester;
-$tester->loadModel('program');
-$programs1 = $tester->program->getTreeMenu(1);
-
-r(strlen($programs1)) && p() && e('789'); // 查看返回的字符个数
\ No newline at end of file
+r(strlen($programs1)) && p() && e('396'); // 查看返回的字符个数

From 03d913eb7813fb214a77e408c3ca7adea0f31f14 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 14:38:07 +0800
Subject: [PATCH 15/59] * Modify unit test of user.

---
 test/class/user.class.php                | 30 ++++++++++++++-----
 test/model/user/getavatarpairs.php       | 27 ++++++++++++++---
 test/model/user/getcommiters.php         | 12 ++++++--
 test/model/user/getlist.php              | 34 ++++++++++++++++-----
 test/model/user/getlistbyaccounts.php    | 33 +++++++++++++++-----
 test/model/user/getpairs.php             | 38 +++++++++++++++---------
 test/model/user/getrealnameandemails.php | 26 ++++++++++++----
 test/model/user/setuserlist.php          | 34 +++++++++++++++++++++
 8 files changed, 187 insertions(+), 47 deletions(-)
 create mode 100755 test/model/user/setuserlist.php

diff --git a/test/class/user.class.php b/test/class/user.class.php
index dcf7725a2f..7f78827947 100755
--- a/test/class/user.class.php
+++ b/test/class/user.class.php
@@ -14,9 +14,9 @@ class userTest
      * @access public
      * @return void
      */
-    public function getListTest($count = false)
+    public function getListTest($params = 'nodeleted', $count = false)
     {
-        $objects = $this->objectModel->getList();
+        $objects = $this->objectModel->getList($params);
         if(dao::isError())
         {
             $error = dao::getError();
@@ -32,13 +32,14 @@ class userTest
      * Test get user information by accounts.
      *
      * @param  array  $accounts
+     * @param  string $keyField
      * @param  bool   $count
      * @access public
      * @return void
      */
-    public function getListByAccountsTest($accounts = array(), $count = false)
+    public function getListByAccountsTest($accounts = array(), $keyField = 'id', $count = false)
     {
-        $objects = $this->objectModel->getListByAccounts($accounts);
+        $objects = $this->objectModel->getListByAccounts($accounts, $keyField);
         if(dao::isError())
         {
             $error = dao::getError();
@@ -77,12 +78,13 @@ class userTest
     /**
      * Test get avatar pairs.
      *
+     * @param  string $params
      * @access public
-     * @return void
+     * @return array
      */
-    public function getAvatarPairsTest()
+    public function getAvatarPairsTest($param = 'nodeleted')
     {
-        $objects = $this->objectModel->getAvatarPairs();
+        $objects = $this->objectModel->getAvatarPairs($param);
         if(dao::isError())
         {
             $error = dao::getError();
@@ -955,4 +957,18 @@ class userTest
     {
         return $this->objectModel->processAccountSort($users);
     }
+
+    /**
+     * Set users list.
+     *
+     * @param  array    $users
+     * @param  string   $account
+     * @access public
+     * @return string
+     */
+    public function setUserListTest($users, $account)
+    {
+        $string = $this->objectModel->setUserList($users, $account);
+        return strpos($string, "<option value='$account' selected='selected'") !== false ? 1 : 0;
+    }
 }
diff --git a/test/model/user/getavatarpairs.php b/test/model/user/getavatarpairs.php
index a54c415aef..c935487dc7 100755
--- a/test/model/user/getavatarpairs.php
+++ b/test/model/user/getavatarpairs.php
@@ -4,17 +4,36 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+$user = zdTable('user');
+$user->id->range('1001-1005');
+$user->account->range('1-5')->prefix("account");
+$user->realname->range('1-5')->prefix("用户名");
+$user->type->range('inside{4},ountside{1}');
+$user->avatar->range('1-5')->prefix('/home/z/user/');
+$user->deleted->range('0{4}, 1{1}');
+$user->gen(5);
+
 /**
 
 title=测试 userModel->getPairs();
 cid=1
 pid=1
 
-所有用户头像的数量 >> 999
-查找account为"user99"的用户的头像路径 >> /home/z/user/15.png
+未删除的用户头像的数量 >> 4
+所有用户头像的数量 >> 5
+在未删除用户中查找account为"account1"的用户的头像路径 >> /home/z/user/1
+在未删除用户中查找account为"account2"的用户的头像路径 >> /home/z/user/2
+在未删除用户中查找account为"account3"的用户的头像路径 >> /home/z/user/3
+在未删除用户中查找account为"account4"的用户的头像路径 >> /home/z/user/4
+在所有用户中查找account为"account5"的用户的头像路径 >> /home/z/user/5
 
 */
 $user = new userTest();
 
-r(count($user->getAvatarPairsTest())) && p()         && e('999');                 //所有用户头像的数量
-r($user->getAvatarPairsTest())        && p('user99') && e('/home/z/user/15.png'); //查找account为"user99"的用户的头像路径
\ No newline at end of file
+r(count($user->getAvatarPairsTest()))      && p()           && e('4');              // 未删除的用户头像的数量
+r(count($user->getAvatarPairsTest('all'))) && p()           && e('5');              // 所有用户头像的数量
+r($user->getAvatarPairsTest())             && p('account1') && e('/home/z/user/1'); // 在未删除用户中查找account为"account1"的用户的头像路径
+r($user->getAvatarPairsTest())             && p('account2') && e('/home/z/user/2'); // 在未删除用户中查找account为"account2"的用户的头像路径
+r($user->getAvatarPairsTest())             && p('account3') && e('/home/z/user/3'); // 在未删除用户中查找account为"account3"的用户的头像路径
+r($user->getAvatarPairsTest())             && p('account4') && e('/home/z/user/4'); // 在未删除用户中查找account为"account4"的用户的头像路径
+r($user->getAvatarPairsTest('all'))        && p('account5') && e('/home/z/user/5'); // 在所有用户中查找account为"account5"的用户的头像路径
diff --git a/test/model/user/getcommiters.php b/test/model/user/getcommiters.php
index 50be90732d..5b2d87f9fb 100755
--- a/test/model/user/getcommiters.php
+++ b/test/model/user/getcommiters.php
@@ -4,9 +4,17 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+$user = zdTable('user');
+$user->id->range('1001-1005');
+$user->account->range('1-5')->prefix("account");
+$user->realname->range('1-5')->prefix("用户名");
+$user->type->range('inside{3},outside{2}');
+$user->deleted->range('0-1');
+$user->gen(5);
+
 /**
 
-title=测试 userModel->getPairs();
+title=测试 userModel->getCommiters();
 cid=1
 pid=1
 
@@ -19,4 +27,4 @@ $user = new userTest();
 $commiters = $user->getCommitersTest();
 
 r($commiters)        && p('qd100') && e('高层管理100'); //获取源代码账号为qd100的用户真实姓名
-r(count($commiters)) && p()        && e('1000');        //获取系统中源代码账号不为空的用户数量
\ No newline at end of file
+r(count($commiters)) && p()        && e('1000');        //获取系统中源代码账号不为空的用户数量
diff --git a/test/model/user/getlist.php b/test/model/user/getlist.php
index 4c88e90da7..46ba5f6f3e 100755
--- a/test/model/user/getlist.php
+++ b/test/model/user/getlist.php
@@ -4,22 +4,40 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+$user = zdTable('user');
+$user->id->range('1001-1005');
+$user->account->range('1-5')->prefix("account");
+$user->realname->range('1-5')->prefix("用户名");
+$user->type->range('inside{3},outside{2}');
+$user->deleted->range('0-1');
+$user->gen(5);
+
 /**
 
 title=测试 userModel->getList();
 cid=1
 pid=1
 
-查找系统中第二个未删除的、内部用户真实姓名,根据account正序排 >> 开发1
-查找系统中未删除的、根据account正序排的最后一个用户的姓名 >> 测试99
-查找系统中所有未删除的、内部用户的数量 >> 999
-查找系统中不存在的用户,输出错误提示 >> Error: Cannot get index 1000
+查找系统中第一个未删除的、内部用户真实姓名,根据account正序排 >> 用户名1
+查找系统中第二个未删除的、内部用户真实姓名,根据account正序排 >> 用户名3
+查找系统中所有未删除的、内部用户的数量 >> 2
+查找系统中第一个用户的真实姓名 >> 用户名1
+查找系统中第二个用户的真实姓名 >> 用户名2
+查找系统中第三个用户的真实姓名 >> 用户名3
+查找系统中第四个用户的真实姓名 >> 用户名4
+查找系统中第五个用户的真实姓名 >> 用户名5
+查找系统中所有用户数量 >> 5
 
 */
 
 $user = new userTest();
 
-r($user->getListTest())     && p('1:realname')    && e('开发1');                        //查找系统中第二个未删除的、内部用户真实姓名,根据account正序排
-r($user->getListTest())     && p('998:realname')  && e('测试99');                       //查找系统中未删除的、根据account正序排的最后一个用户的姓名
-r($user->getListTest(true)) && p()                && e('999');                          //查找系统中所有未删除的、内部用户的数量
-r($user->getListTest())     && p('1000:realname') && e('Error: Cannot get index 1000'); //查找系统中不存在的用户,输出错误提示
\ No newline at end of file
+r($user->getListTest())                  && p('0:realname') && e('用户名1'); // 查找系统中第一个未删除的、内部用户真实姓名,根据account正序排
+r($user->getListTest())                  && p('1:realname') && e('用户名3'); // 查找系统中第二个未删除的、内部用户真实姓名,根据account正序排
+r($user->getListTest('nodeleted', true)) && p()             && e('2');       // 查找系统中所有未删除的、内部用户的数量
+r($user->getListTest('all'))             && p('0:realname') && e('用户名1'); // 查找系统中第一个用户的真实姓名
+r($user->getListTest('all'))             && p('1:realname') && e('用户名2'); // 查找系统中第二个用户的真实姓名
+r($user->getListTest('all'))             && p('2:realname') && e('用户名3'); // 查找系统中第三个用户的真实姓名
+r($user->getListTest('all'))             && p('3:realname') && e('用户名4'); // 查找系统中第四个用户的真实姓名
+r($user->getListTest('all'))             && p('4:realname') && e('用户名5'); // 查找系统中第五个用户的真实姓名
+r($user->getListTest('all', true))       && p()             && e('5');       // 查找系统中所有用户数量
diff --git a/test/model/user/getlistbyaccounts.php b/test/model/user/getlistbyaccounts.php
index eaf19669de..eb680545ea 100755
--- a/test/model/user/getlistbyaccounts.php
+++ b/test/model/user/getlistbyaccounts.php
@@ -4,21 +4,40 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+$user = zdTable('user');
+$user->id->range('1001-1005');
+$user->account->range('1-5')->prefix("account");
+$user->realname->range('1-5')->prefix("用户名");
+$user->role->range('po,pd,qa,qd,pm');
+$user->type->range('inside{3},outside{2}');
+$user->deleted->range('0-1');
+$user->gen(5);
+
 /**
 
 title=测试 userModel->getListByAccounts();
 cid=1
 pid=1
 
-按照给定的用户名列表查询用户信息，获取用户ID为1的用户真实姓名和角色 >> admin,qa
-按照给定的用户名列表查询用户信息，获取查询出的用户列表数量 >> 3
-按照给定的用户名列表查询用户信息，获取用户ID为0的用户信息 >> Error: Cannot get index 0.
+按照给定的用户名列表查询用户信息，获取用户ID为1001的用户真实姓名和角色 >> 用户名1,po
+按照给定的用户名列表查询用户信息，获取用户ID为1002的用户真实姓名和角色 >> 用户名2,pd
+按照给定的用户名列表查询用户信息，获取用户ID为1003的用户真实姓名和角色 >> 用户名3,qa
+按照给定的用户名列表查询用户信息，获取用户ID为1004的用户真实姓名和角色 >> 用户名4,qd
+按照给定的用户名列表查询用户信息，获取查询出的用户列表数量 >> 5
+删除account4后，按照给定的用户名列表查询用户信息，获取用户account为account2的用户真实姓名和角色 >> 用户名2,pd
+删除account4后，按照给定的用户名列表查询用户信息，获取查询出的用户列表数量 >> 4
 
 */
-$accounts = array('admin', 'program1whitelist', 'user10', 'ccsdqq@!');
+$accounts = array('account1', 'account2', 'account3', 'account4', 'account5');
+$keyFiled = array('id', 'account');
 $count    = array(0 => false, 1 => true);
 
 $user = new userTest();
-r($user->getListByAccountsTest($accounts, $count[0])) && p('1:realname,role')   && e('admin,qa');                   //按照给定的用户名列表查询用户信息，获取用户ID为1的用户真实姓名和角色
-r($user->getListByAccountsTest($accounts, $count[1])) && p()                    && e('3');                          //按照给定的用户名列表查询用户信息，获取查询出的用户列表数量
-r($user->getListByAccountsTest($accounts, $count[0])) && p('0:realname')        && e('Error: Cannot get index 0.'); //按照给定的用户名列表查询用户信息，获取用户ID为0的用户信息
\ No newline at end of file
+r($user->getListByAccountsTest($accounts, $keyFiled[0], $count[0])) && p('1001:realname,role')     && e('用户名1,po');                 // 按照给定的用户名列表查询用户信息，获取用户ID为1001的用户真实姓名和角色
+r($user->getListByAccountsTest($accounts, $keyFiled[0], $count[0])) && p('1002:realname,role')     && e('用户名2,pd');                 // 按照给定的用户名列表查询用户信息，获取用户ID为1002的用户真实姓名和角色
+r($user->getListByAccountsTest($accounts, $keyFiled[0], $count[0])) && p('1003:realname,role')     && e('用户名3,qa');                 // 按照给定的用户名列表查询用户信息，获取用户ID为1003的用户真实姓名和角色
+r($user->getListByAccountsTest($accounts, $keyFiled[0], $count[0])) && p('1004:realname,role')     && e('用户名4,qd');                 // 按照给定的用户名列表查询用户信息，获取用户ID为1004的用户真实姓名和角色
+r($user->getListByAccountsTest($accounts, $keyFiled[0], $count[1])) && p()                         && e('5');                          // 按照给定的用户名列表查询用户信息，获取查询出的用户列表数量
+unset($accounts[3]);
+r($user->getListByAccountsTest($accounts, $keyFiled[1], $count[0])) && p('account2:realname,role') && e('用户名2,pd');                 // 删除account4后，按照给定的用户名列表查询用户信息，获取用户account为account2的用户真实姓名和角色
+r($user->getListByAccountsTest($accounts, $keyFiled[1], $count[1])) && p()                         && e('4');                          // 删除account4后，按照给定的用户名列表查询用户信息，获取查询出的用户列表数量
diff --git a/test/model/user/getpairs.php b/test/model/user/getpairs.php
index 03d39d3973..2cea513267 100755
--- a/test/model/user/getpairs.php
+++ b/test/model/user/getpairs.php
@@ -4,6 +4,16 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+$user = zdTable('user');
+$user->id->range('1001-1006');
+$user->account->range('1-6')->prefix("account");
+$user->realname->range('1-6')->prefix("用户名");
+$user->type->range('inside{3},outside{3}');
+$user->role->range('po,pd,qa,qd,pm,dev');
+$user->deleted->range('0{4}, 1{2}');
+$user->visions->range('rnd');
+$user->gen(5);
+
 /**
 
 title=测试 userModel->getPairs();
@@ -11,37 +21,37 @@ cid=1
 pid=1
 
 查找带有Closed用户的外部用户键值对 >> Closed
-查找带有首字母的外部用户键值对 >> O:用户1
-查找不带首字母的外部用户键值对 >> 用户1
+查找带有首字母的外部用户键值对 >> A:用户名4
+查找不带首字母的外部用户键值对 >> 用户名4
 按照给定的用户名查找用户键值对，返回值中不带有Closed用户 >> 1
 按照给定的用户名查找用户键值对，返回值中带有Closed用户 >> 2
 使用limit参数来限制最多获取2个用户键值对 >> 2
-使用limit参数来限制最多获取50个用户键值对 >> 50
-使用pofirst参数来将系统中的产品经理用户放到返回值前列 >> P:测试主管58
-使用pmfirst参数来将系统中的项目经理用户放到返回值前列 >> O:其他100
+使用limit参数来限制最多获取50个用户键值对 >> 3
+使用pofirst参数来将系统中的产品经理用户放到返回值前列 >> A:用户名1
+使用pmfirst参数来将系统中的项目经理内部和外部用户放到返回值前列 >> A:用户名3
 
 */
+$usersToAppended = array('account5', 'account1');
 
 $user = new userTest();
-$accounts                   = array('tesrasd1asd#@!#$', 'ASD123中文', 'user10', 'ccsdqq@!');
 $outsideUsersWithClosed     = $user->getPairsTest('outside');
 $outsideUsersWithLetter     = $user->getPairsTest('outside|noclosed');
 $outsideUsersNoLetter       = $user->getPairsTest('outside|noclosed|noletter');
-$usersInAccountsNoclosed    = $user->getPairsTest('noempty|noclosed', '', 0, $accounts);
-$usersInAccountsWithclosed  = $user->getPairsTest('noempty', '', 0, $accounts);
+$usersInAccountsNoclosed    = $user->getPairsTest('noempty|noclosed', '', 0, $usersToAppended);
+$usersInAccountsWithclosed  = $user->getPairsTest('noempty', '', 0, $usersToAppended);
 $limit2Users                = $user->getPairsTest('noempty|noclosed', '', 2);
 $limit50Users               = $user->getPairsTest('noempty|noclosed', '', 50);
 $POFirstUsers               = $user->getPairsTest('noempty|noclosed|pofirst');
-$PMFirstUsers               = $user->getPairsTest('noempty|noclosed|pmfirst');
+$PMFirstUsers               = $user->getPairsTest('noempty|noclosed|all|devfirst');
 $firstPO                    = array_slice($POFirstUsers, 0, 1);
 $firstPM                    = array_slice($PMFirstUsers, 0, 1);
 
 r($outsideUsersWithClosed)           && p('closed')     && e('Closed');       //查找带有Closed用户的外部用户键值对
-r($outsideUsersWithLetter)           && p('outside1')   && e('O:用户1');      //查找带有首字母的外部用户键值对
-r($outsideUsersNoLetter)             && p('outside1')   && e('用户1');        //查找不带首字母的外部用户键值对
+r($outsideUsersWithLetter)           && p('account4')   && e('A:用户名4');    //查找带有首字母的外部用户键值对
+r($outsideUsersNoLetter)             && p('account4')   && e('用户名4');      //查找不带首字母的外部用户键值对
 r(count($usersInAccountsNoclosed))   && p()             && e('1');            //按照给定的用户名查找用户键值对，返回值中不带有Closed用户
 r(count($usersInAccountsWithclosed)) && p()             && e('2');            //按照给定的用户名查找用户键值对，返回值中带有Closed用户
 r(count($limit2Users))               && p()             && e('2');            //使用limit参数来限制最多获取2个用户键值对
-r(count($limit50Users))              && p()             && e('50');           //使用limit参数来限制最多获取50个用户键值对
-r($firstPO)                          && p('pd58')       && e('P:测试主管58'); //使用pofirst参数来将系统中的产品经理用户放到返回值前列
-r($firstPM)                          && p('outside100') && e('O:其他100');    //使用pmfirst参数来将系统中的项目经理用户放到返回值前列
\ No newline at end of file
+r(count($limit50Users))              && p()             && e('3');            //使用limit参数来限制最多获取50个用户键值对
+r($firstPO)                          && p('account1')   && e('A:用户名1');    //使用pofirst参数来将系统中的产品经理用户放到返回值前列
+r($firstPM)                          && p('account3')   && e('A:用户名3');    //使用pmfirst参数来将系统中的项目经理内部和外部用户放到返回值前列
diff --git a/test/model/user/getrealnameandemails.php b/test/model/user/getrealnameandemails.php
index e3c24f4a7a..c7b12aef73 100755
--- a/test/model/user/getrealnameandemails.php
+++ b/test/model/user/getrealnameandemails.php
@@ -4,20 +4,36 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+$user = zdTable('user');
+$user->id->range('1001-1005');
+$user->account->range('1-5')->prefix("account");
+$user->realname->range('1-5')->prefix("用户名");
+$user->email->range('account1@qq.com,account2@qq.com,account3@qq.com,account4@qq.com,account5@qq.com');
+$user->deleted->range('0{5}');
+$user->gen(5);
+
 /**
 
 title=测试 userModel->getPairs();
 cid=1
 pid=1
 
-获取admin的邮箱 >> 833482@qq.com
-从accounts中获取到的用户邮箱数量 >> 2
+获取account1的邮箱和真实姓名 >> account1@qq.com,用户名1
+获取account2的邮箱和真实姓名 >> account2@qq.com,用户名2
+获取account3的邮箱和真实姓名 >> account3@qq.com,用户名3
+获取account4的邮箱和真实姓名 >> account4@qq.com,用户名4
+获取account5的邮箱和真实姓名 >> account5@qq.com,用户名5
+从accounts中获取到的用户邮箱数量 >> 5
 
 */
 
-$accounts = array('tesrasd1asd#@!#$', 'ASD123中文', 'user10', 'ccsdqq@!', 'admin');
+$accounts = array('account1', 'account2', 'account3', 'account4', 'account5');
 $user     = new userTest();
 $emails   = $user->getRealNameAndEmailsTest($accounts);
 
-r($emails['admin'])  && p('email') && e('833482@qq.com'); //获取admin的邮箱
-r(count($emails))    && p()        && e('2');             //从accounts中获取到的用户邮箱数量
\ No newline at end of file
+r($emails['account1'])  && p('email,realname') && e('account1@qq.com,用户名1'); //获取account1的邮箱和真实姓名
+r($emails['account2'])  && p('email,realname') && e('account2@qq.com,用户名2'); //获取account2的邮箱和真实姓名
+r($emails['account3'])  && p('email,realname') && e('account3@qq.com,用户名3'); //获取account3的邮箱和真实姓名
+r($emails['account4'])  && p('email,realname') && e('account4@qq.com,用户名4'); //获取account4的邮箱和真实姓名
+r($emails['account5'])  && p('email,realname') && e('account5@qq.com,用户名5'); //获取account5的邮箱和真实姓名
+r(count($emails))       && p()                 && e('5');                       //从accounts中获取到的用户邮箱数量
diff --git a/test/model/user/setuserlist.php b/test/model/user/setuserlist.php
new file mode 100755
index 0000000000..be2486a71f
--- /dev/null
+++ b/test/model/user/setuserlist.php
@@ -0,0 +1,34 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+$user = zdTable('user');
+$user->id->range('1001-1005');
+$user->account->range('1-5')->prefix("account");
+$user->realname->range('1-5')->prefix("用户名");
+$user->deleted->range('0-1');
+$user->gen(5);
+
+/**
+
+title=测试 userModel::setUserList();
+cid=1
+pid=1
+
+测试获取account1的是否在列表中 >> 1
+测试获取account2的是否在列表中 >> 1
+测试获取account3的是否在列表中 >> 1
+测试获取account4的是否在列表中 >> 1
+测试获取account5的是否在列表中 >> 0
+
+*/
+$users = array('account1' => '用户名1', 'account2' => '用户名2', 'account3' => '用户名3', 'account4' => '用户名4');
+
+$user = new userTest();
+r($user->setUserListTest($users, 'account1')) && p() && e('1');    // 测试获取account1的是否在列表中
+r($user->setUserListTest($users, 'account2')) && p() && e('1');    // 测试获取account2的是否在列表中
+r($user->setUserListTest($users, 'account3')) && p() && e('1');    // 测试获取account3的是否在列表中
+r($user->setUserListTest($users, 'account4')) && p() && e('1');    // 测试获取account4的是否在列表中
+r($user->setUserListTest($users, 'account5')) && p() && e('0');    // 测试获取account5的是否在列表中

From 2bf91bac23a1211dccd713480541758251d80ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 14:48:35 +0800
Subject: [PATCH 16/59] * Add case of program model.

---
 test/class/program.class.php          | 11 +++++++++++
 test/lib/init.php                     |  2 +-
 test/model/program/getkanbangroup.php | 24 ++++++++++++++++++------
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index f223f5bce5..3dce3c683a 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -211,4 +211,15 @@ class programTest
     {
         return $this->program->getTreeMenu($programID);
     }
+
+    /**
+     * Get kanban group.
+     *
+     * @access public
+     * @return array
+     */
+    public function getKanbanGroupTest()
+    {
+        return $this->program->getKanbanGroup();
+    }
 }
diff --git a/test/lib/init.php b/test/lib/init.php
index 9fed533cd7..e670afa9cb 100644
--- a/test/lib/init.php
+++ b/test/lib/init.php
@@ -259,7 +259,7 @@ function zdImport($table, $yaml, $count = 10)
 function su($account)
 {
     $userModel = new userModel();
-    $user = $userModel->identify($account, '123qwe!@#');
+    $user = $userModel->identify($account, '123Qwe!@#');
     if($user) return $userModel->login($user);
     return false;
 }
diff --git a/test/model/program/getkanbangroup.php b/test/model/program/getkanbangroup.php
index fc21900f8a..e794f8bb31 100755
--- a/test/model/program/getkanbangroup.php
+++ b/test/model/program/getkanbangroup.php
@@ -1,8 +1,21 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-3');
+$program->name->range('1-3')->prefix('项目集');
+$program->type->range('program');
+$program->path->range('1-3')->prefix(',')->postfix(',');
+$program->grade->range('1');
+$program->status->range('wait');
+$program->openedBy->range('admin,test1');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(3);
+
 /**
 
 title=测试 programModel::getKanbanGroup();
@@ -10,16 +23,15 @@ cid=1
 pid=1
 
 查看当前用户负责的项目集看板数量 >> 2
-查看当前用户其他的项目集看板数量 >> 8
+查看当前用户其他的项目集看板数量 >> 1
 查看当前用户其他的项目集看板详情 >> 项目集2
 
 */
 
-global $tester;
-$tester->loadModel('program');
+$programTester = new programTest();
 
-$kanbanGroup = $tester->program->getKanbanGroup();
+$kanbanGroup = $programTester->getKanbanGroupTest();
 
 r(count($kanbanGroup['my']))     && p('')       && e('2');       //查看当前用户负责的项目集看板数量
-r(count($kanbanGroup['others'])) && p('')       && e('8');       //查看当前用户其他的项目集看板数量
-r($kanbanGroup['others'])        && p('0:name') && e('项目集2'); //查看当前用户其他的项目集看板详情
\ No newline at end of file
+r(count($kanbanGroup['others'])) && p('')       && e('1');       //查看当前用户其他的项目集看板数量
+r($kanbanGroup['others'])        && p('0:name') && e('项目集2'); //查看当前用户其他的项目集看板详情

From 7d660348c61e4d725a3a372471fbec6c1768cb4c Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 5 Jan 2023 14:50:49 +0800
Subject: [PATCH 17/59] * Code for code error.

---
 module/tutorial/model.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/tutorial/model.php b/module/tutorial/model.php
index d2b0a8b723..83912ef697 100644
--- a/module/tutorial/model.php
+++ b/module/tutorial/model.php
@@ -225,6 +225,9 @@ class tutorialModel extends model
         $execution->teamCount   = count($execution->teamMembers);
         $execution->hasProduct  = '';
         $execution->multiple    = '';
+        $execution->order       = 1;
+        $execution->burns       = array(''); 
+        $execution->type        = 'sprint'; 
 
         if($browseType and $browseType != 'all') $execution->name .= '-' . $browseType; // Fix bug #21096
 

From 5605c0e13071dbd7a9e2cfb04938895e8d9058d3 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 14:55:36 +0800
Subject: [PATCH 18/59] * Test case for gettoppairs.

---
 test/class/program.class.php       | 14 ++++++++++++++
 test/model/program/gettoppairs.php | 28 ++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index f223f5bce5..71b1f5f811 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -211,4 +211,18 @@ class programTest
     {
         return $this->program->getTreeMenu($programID);
     }
+
+    /**
+     * Get top pairs.
+     *
+     * @param  string $model
+     * @param  string $mode
+     * @param  bool   $isQueryAll
+     * @access public
+     * @return void
+     */
+    public function getTopPairsTest($model = '', $mode = '', $isQueryAll = false)
+    {
+        return $this->program->getTopPairs($model, $mode, $isQueryAll);
+    }
 }
diff --git a/test/model/program/gettoppairs.php b/test/model/program/gettoppairs.php
index 1def059995..bfcb1e9dd3 100755
--- a/test/model/program/gettoppairs.php
+++ b/test/model/program/gettoppairs.php
@@ -1,23 +1,35 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-5');
+$program->name->range('项目集1,项目集2');
+$program->type->range('program');
+$program->grade->range('1,1,0{3}');
+$program->status->range('wait,closed,wait{3}');
+$program->parent->range('0,0,1,1,2');
+$program->path->range('1,2,`1,3`,`1,4`,`2,5`')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(5);
+
 /**
 
 title=测试 programModel::getTopPairs();
 cid=1
 pid=1
 
-获取系统中所有顶级项目集数量 >> 10
-获取系统中所有未关闭的顶级项目集数量 >> 10
-获取系统中所有顶级项目集数量 >> 10
+获取系统中所有顶级项目集数量 >> 2
+获取系统中所有未关闭的顶级项目集数量 >> 1
+获取系统中所有顶级项目集数量 >> 2
 
 */
 
-global $tester;
-$tester->loadModel('program');
+$programTester = new programTest();
 
-r(count($tester->program->getTopPairs()))               && p() && e('10'); // 获取系统中所有顶级项目集数量
-r(count($tester->program->getTopPairs('', 'noclosed'))) && p() && e('10'); // 获取系统中所有未关闭的顶级项目集数量
-r(count($tester->program->getTopPairs('', '', true)))   && p() && e('10'); // 获取系统中所有顶级项目集数量
\ No newline at end of file
+r(count($programTester->getTopPairsTest()))               && p() && e('2'); // 获取系统中所有顶级项目集数量
+r(count($programTester->getTopPairsTest('', 'noclosed'))) && p() && e('1'); // 获取系统中所有未关闭的顶级项目集数量
+r(count($programTester->getTopPairsTest('', '', true)))   && p() && e('2'); // 获取系统中所有顶级项目集数量

From 45d8ac363ca30a35281e3d2dc9d1e860f28698bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 14:59:46 +0800
Subject: [PATCH 19/59] * Add case of program model.

---
 test/class/program.class.php   |  2 +-
 test/model/program/getlist.php | 60 ++++++++++++++++++++--------------
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 5c6944204d..687ffddcfb 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -75,7 +75,7 @@ class programTest
      * @access public
      * @return void
      */
-    public function getList($status = 'all', $orderBy = 'id_asc', $pager = NULL, $type = '', $idList = '')
+    public function getListTest($status = 'all', $orderBy = 'id_asc', $pager = NULL, $type = '', $idList = '')
     {
         $this->program->cookie->showClosed = 'ture';
         $programs = $this->program->getList($status, $orderBy, $pager, $type, $idList);
diff --git a/test/model/program/getlist.php b/test/model/program/getlist.php
index 52270bda2a..de6fb07548 100755
--- a/test/model/program/getlist.php
+++ b/test/model/program/getlist.php
@@ -4,45 +4,57 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-20');
+$program->name->range('1-20')->prefix('项目集');
+$program->type->range('program');
+$program->path->range('1-20')->prefix(',')->postfix(',');
+$program->grade->range('1');
+$program->status->range('wait,doing,suspended,closed');
+$program->openedBy->range('admin,test1');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(20);
+
 /**
 
 title=测试 programModel::getList();
 cid=1
 pid=1
 
-查看所有项目和项目集的个数 >> 120
+查看所有项目和项目集的个数 >> 20
 查看分页后项目集和项目的个数 >> 10
-查看所有'closed'的项目和项目集的个数 >> 11
-查看所有'suspended'的项目和项目集的个数 >> 11
+查看所有'closed'的项目和项目集的个数 >> 5
+查看所有'suspended'的项目和项目集的个数 >> 5
 按照项目和项目集名称倒序获取第一个ID >> 9
 按照ID正序获取项目和项目集列表第一个ID >> 1
-获取顶级项目集个数 >> 30
+获取顶级项目集个数 >> 20
 获取分页后顶级项目集个数 >> 10
-获取分页后顶级项目集个数 >> 120
+获取所有项目集个数 >> 20
 
 */
 
 global $tester;
-$program = new programTest();
+$programTester = new programTest();
 $tester->app->loadClass('pager', $static = true);
 $pager = new pager(0, 10, 1);
 
-$allPorgrams       = $program->getList('all');
-$pagerPrograms     = $program->getList('all', 'id_asc', $pager);
-$closedPrograms    = $program->getList('closed');
-$suspendedPrograms = $program->getList('closed');
-$namedescPrograms  = $program->getList('all', 'name_desc');
-$idascPrograms     = $program->getList('all', 'id_asc');
-$topPrograms       = $program->getList('all', 'id_asc', null, 'top');
-$topPagePrograms   = $program->getList('all', 'id_asc', $pager, 'top');
-$childPrograms     = $program->getList('all', 'id_asc', null, 'child', $topPrograms);
+$allPorgrams       = $programTester->getListTest('all');
+$pagerPrograms     = $programTester->getListTest('all', 'id_asc', $pager);
+$closedPrograms    = $programTester->getListTest('closed');
+$suspendedPrograms = $programTester->getListTest('closed');
+$namedescPrograms  = $programTester->getListTest('all', 'name_desc');
+$idascPrograms     = $programTester->getListTest('all', 'id_asc');
+$topPrograms       = $programTester->getListTest('all', 'id_asc', null, 'top');
+$topPagePrograms   = $programTester->getListTest('all', 'id_asc', $pager, 'top');
+$childPrograms     = $programTester->getListTest('all', 'id_asc', null, 'child', $topPrograms);
 
-r(count($allPorgrams))       && p() && e('120'); // 查看所有项目和项目集的个数
-r(count($pagerPrograms))     && p() && e('10');  // 查看分页后项目集和项目的个数
-r(count($closedPrograms))    && p() && e('11');  // 查看所有'closed'的项目和项目集的个数
-r(count($suspendedPrograms)) && p() && e('11');  // 查看所有'suspended'的项目和项目集的个数
-r(key($namedescPrograms))    && p() && e('9');   // 按照项目和项目集名称倒序获取第一个ID
-r(key($idascPrograms))       && p() && e('1');   // 按照ID正序获取项目和项目集列表第一个ID
-r(count($topPrograms))       && p() && e('30');  // 获取顶级项目集个数
-r(count($topPagePrograms))   && p() && e('10');  // 获取分页后顶级项目集个数
-r(count($childPrograms))     && p() && e('120'); // 获取分页后顶级项目集个数
\ No newline at end of file
+r(count($allPorgrams))       && p() && e('20'); // 查看所有项目和项目集的个数
+r(count($pagerPrograms))     && p() && e('10'); // 查看分页后项目集和项目的个数
+r(count($closedPrograms))    && p() && e('5');  // 查看所有'closed'的项目和项目集的个数
+r(count($suspendedPrograms)) && p() && e('5');  // 查看所有'suspended'的项目和项目集的个数
+r(key($namedescPrograms))    && p() && e('9');  // 按照项目和项目集名称倒序获取第一个ID
+r(key($idascPrograms))       && p() && e('1');  // 按照ID正序获取项目和项目集列表第一个ID
+r(count($topPrograms))       && p() && e('20'); // 获取顶级项目集个数
+r(count($topPagePrograms))   && p() && e('10'); // 获取分页后顶级项目集个数
+r(count($childPrograms))     && p() && e('20'); // 获取所有项目集个数

From 04be94e922ca8ae14194a669c811177f16bf1f68 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 5 Jan 2023 15:17:06 +0800
Subject: [PATCH 20/59] * Code for tutorial bug.

---
 module/tutorial/model.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/module/tutorial/model.php b/module/tutorial/model.php
index 83912ef697..b6dab0d78a 100644
--- a/module/tutorial/model.php
+++ b/module/tutorial/model.php
@@ -71,6 +71,7 @@ class tutorialModel extends model
         $product->type           = 'normal';
         $product->status         = 'normal';
         $product->desc           = '';
+        $product->shadow         = '0';
         $product->PO             = $this->app->user->account;
         $product->QD             = '';
         $product->RD             = '';
@@ -216,22 +217,24 @@ class tutorialModel extends model
      */
     public function getExecutionStats($browseType = '')
     {
-        $execution   = $this->getProject();
+        $execution = $this->getProject();
         $emptyHour = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0);
 
-        $execution->hours       = (object)$emptyHour;
-        $execution->leftTasks   = '—';
-        $execution->teamMembers = array_keys($this->getTeamMembers());
-        $execution->teamCount   = count($execution->teamMembers);
-        $execution->hasProduct  = '';
-        $execution->multiple    = '';
-        $execution->order       = 1;
-        $execution->burns       = array(''); 
-        $execution->type        = 'sprint'; 
+        $execution->hours        = (object)$emptyHour;
+        $execution->leftTasks    = '—';
+        $execution->teamMembers  = array_keys($this->getTeamMembers());
+        $execution->teamCount    = count($execution->teamMembers);
+        $execution->hasProduct   = '';
+        $execution->multiple     = '';
+        $execution->order        = 1;
+        $execution->burns        = array(''); 
+        $execution->type         = 'sprint'; 
+        $execution->projectName  = ''; 
+        $execution->projectModel = ''; 
 
         if($browseType and $browseType != 'all') $execution->name .= '-' . $browseType; // Fix bug #21096
 
-        $executionStat[$execution->id] = $execution;
+        $executionStat[0] = $execution;
         return $executionStat;
     }
 

From e0106ce5232b862f5f971831ddc248f563677d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 15:25:40 +0800
Subject: [PATCH 21/59] * Add case of program model.

---
 test/class/program.class.php    |  5 +++++
 test/model/program/getpairs.php | 37 +++++++++++++++++++++++----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 687ffddcfb..9feb69502c 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -15,6 +15,11 @@ class programTest
         $this->program = $tester->loadModel('program');
     }
 
+    public function getPairsTest($isQueryAll = false, $orderBy = 'id_desc')
+    {
+        return $this->program->getPairs($isQueryAll, $orderBy);
+    }
+
     /**
      * Test create program.
      *
diff --git a/test/model/program/getpairs.php b/test/model/program/getpairs.php
index ed058ca61c..495eac8e46 100755
--- a/test/model/program/getpairs.php
+++ b/test/model/program/getpairs.php
@@ -1,6 +1,21 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+su('admin');
+
+$program = zdTable('project');
+$program->id->range('1-20');
+$program->name->range('1-20')->prefix('项目集');
+$program->type->range('program');
+$program->path->range('1-20')->prefix(',')->postfix(',');
+$program->grade->range('1');
+$program->status->range('wait,doing,suspended,closed');
+$program->openedBy->range('admin,test1');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->deleted->range('0{15},1{5}');
+$program->gen(20);
 
 /**
 
@@ -8,18 +23,18 @@ title=测试 programModel::getPairs();
 cid=1
 pid=1
 
-获取项目集个数 >> 6
-获取项目集个数 >> 10
-获取项目集id为9的名称 >> 项目集9
+获取项目集个数 >> 15
+获取所有项目集个数 >> 15
+获取按照id正序的第一个项目集名称 >> 项目集1
 
 */
 
-global $tester;
-$tester->loadModel('program');
-$programs1 = $tester->program->getPairs();
-$programs2 = $tester->program->getPairs('true');
+$programTester = new programTest();
 
-r(count($programs1)) && p()     && e('6');       // 获取项目集个数
-r(count($programs2)) && p()     && e('10');      // 获取项目集个数
-r($programs1)        && p('9')  && e('项目集9'); // 获取项目集id为9的名称
-r($programs2)        && p('11') && e('');        // 获取不存在的项目集
\ No newline at end of file
+$programs1 = $programTester->getPairsTest();
+$programs2 = $programTester->getPairsTest('true');
+$programs3 = $programTester->getPairsTest('false', 'id_asc');
+
+r(count($programs1))   && p()    && e('15');      // 获取项目集个数
+r(count($programs2))   && p()    && e('15');      // 获取所有项目集个数
+r(current($programs3)) && p('1') && e('项目集1'); // 获取按照id正序的第一个项目集名称

From 45b7743c0b87fbea16baf483cfad933aad4fd6aa Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 5 Jan 2023 15:26:59 +0800
Subject: [PATCH 22/59] * Code for tutorial error.

---
 module/tutorial/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/tutorial/model.php b/module/tutorial/model.php
index b6dab0d78a..c574509196 100644
--- a/module/tutorial/model.php
+++ b/module/tutorial/model.php
@@ -167,7 +167,7 @@ class tutorialModel extends model
         $project->displayCards = 0;
         $project->fluidBoard   = 0;
         $project->deleted      = '0';
-        $project->hasProduct   = '';
+        $project->hasProduct   = '1';
         $project->multiple     = '';
         $project->division     = 0;
 

From cb85a430d4505a528a6c941b0c0e0ca89d928463 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 5 Jan 2023 07:32:46 +0000
Subject: [PATCH 23/59] * Resolve feedback#1869

---
 module/custom/control.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/module/custom/control.php b/module/custom/control.php
index 0e51a8322d..3025c6d940 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -48,7 +48,19 @@ class custom extends control
         $currentLang = $this->app->getClientLang();
 
         $this->app->loadLang($module);
-        $fieldList = zget($this->lang->$module, $field, '');
+        if($lang == 'all')
+        {
+            $fieldList = array();
+            $items     = $this->custom->getItems("lang=all&module=$module&section=$field&vision={$this->config->vision}");
+            foreach($items as $key => $item)
+            {
+                $fieldList[$key] = $item->value;
+            }
+        }
+        else
+        {
+            $fieldList = zget($this->lang->$module, $field, '');
+        }
 
         if($module == 'project' and $field == 'unitList')
         {

From 40a969391df15112c96b1288cd327898c748ae87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 15:33:53 +0800
Subject: [PATCH 24/59] * Add case of program model.

---
 test/class/program.class.php          | 20 +++++++++++++++
 test/model/program/getpairsbylist.php | 36 ++++++++++++++++++---------
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 9feb69502c..09e12cfccc 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -15,11 +15,31 @@ class programTest
         $this->program = $tester->loadModel('program');
     }
 
+    /**
+     * Get pairs.
+     *
+     * @param  bool $isQueryAll
+     * @param  string $orderBy
+     * @access public
+     * @return array
+     */
     public function getPairsTest($isQueryAll = false, $orderBy = 'id_desc')
     {
         return $this->program->getPairs($isQueryAll, $orderBy);
     }
 
+    /**
+     * Get pairs by id list.
+     *
+     * @param  string $programIDList
+     * @access public
+     * @return array
+     */
+    public function getPairsByListTest($programIDList = '')
+    {
+        return $this->program->getPairsByList($programIDList);
+    }
+
     /**
      * Test create program.
      *
diff --git a/test/model/program/getpairsbylist.php b/test/model/program/getpairsbylist.php
index d9214a7e73..b2e72229c9 100755
--- a/test/model/program/getpairsbylist.php
+++ b/test/model/program/getpairsbylist.php
@@ -2,6 +2,19 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+su('admin');
+
+$program = zdTable('project');
+$program->id->range('1-10');
+$program->name->range('1-10')->prefix('项目集');
+$program->type->range('program');
+$program->path->range('1-10')->prefix(',')->postfix(',');
+$program->grade->range('1');
+$program->status->range('wait,doing,suspended,closed');
+$program->openedBy->range('admin,test1');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(10);
 
 /**
 
@@ -13,20 +26,19 @@ pid=1
 通过字符串'1,2,3'获取项目集名称 >> 项目集1,项目集2,项目集3
 通过数组array(1)获取项目集名称 >> 项目集1
 通过数组array(1,2,3)获取项目集名称 >> 项目集1,项目集2,项目集3
-通过id为空获取项目集名称 >> Not Found
-通过id=0获取项目集名称 >> Not Found
-通过id=11获取项目集名称 >> Not Found
+通过id为空获取项目集名称 >> 0
+通过id=0获取项目集名称 >> 0
+通过id=11获取项目集名称 >> 0
 
 */
 
-$program = new programTest();
-
+$programTester = new programTest();
 $programIdList = array('1', '1,2,3', array(1), array(1,2,3), '', '0', '11');
 
-r($program->getPairsByList($programIdList[0])) && p('1')       && e('项目集1');                 // 通过字符串'1'获取项目集名称
-r($program->getPairsByList($programIdList[1])) && p('1,2,3')   && e('项目集1,项目集2,项目集3'); // 通过字符串'1,2,3'获取项目集名称
-r($program->getPairsByList($programIdList[2])) && p('1')       && e('项目集1');                 // 通过数组array(1)获取项目集名称
-r($program->getPairsByList($programIdList[3])) && p('1,2,3')   && e('项目集1,项目集2,项目集3'); // 通过数组array(1,2,3)获取项目集名称
-r($program->getPairsByList($programIdList[4])) && p('message') && e('Not Found');               // 通过id为空获取项目集名称
-r($program->getPairsByList($programIdList[5])) && p('message') && e('Not Found');               // 通过id=0获取项目集名称
-r($program->getPairsByList($programIdList[6])) && p('message') && e('Not Found');               // 通过id=11获取项目集名称
\ No newline at end of file
+r($programTester->getPairsByListTest($programIdList[0])) && p('1')     && e('项目集1');                 // 通过字符串'1'获取项目集名称
+r($programTester->getPairsByListTest($programIdList[1])) && p('1,2,3') && e('项目集1,项目集2,项目集3'); // 通过字符串'1,2,3'获取项目集名称
+r($programTester->getPairsByListTest($programIdList[2])) && p('1')     && e('项目集1');                 // 通过数组array(1)获取项目集名称
+r($programTester->getPairsByListTest($programIdList[3])) && p('1,2,3') && e('项目集1,项目集2,项目集3'); // 通过数组array(1,2,3)获取项目集名称
+r($programTester->getPairsByListTest($programIdList[4])) && p('')      && e('0');                       // 通过id为空获取项目集名称
+r($programTester->getPairsByListTest($programIdList[5])) && p('')      && e('0');                       // 通过id=0获取项目集名称
+r($programTester->getPairsByListTest($programIdList[6])) && p('')      && e('0');                       // 通过id=11获取项目集名称

From 65a3184643d0cb8d6631fb0c2968ac87adbabbc4 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 15:35:08 +0800
Subject: [PATCH 25/59] * Update test case.

---
 test/class/program.class.php              | 12 ++++++
 test/model/program/getteammemberpairs.php | 47 +++++++++++++++++------
 test/model/program/gettoppairs.php        |  4 +-
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 5c6944204d..ca024b7865 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -236,4 +236,16 @@ class programTest
     {
         return $this->program->getKanbanGroup();
     }
+
+    /**
+     * Get team member pairs .
+     *
+     * @param  int    $programID
+     * @access public
+     * @return void
+     */
+    public function getTeamMemberPairsTest($programID)
+    {
+        return $this->program->getTeamMemberPairs($programID);
+    }
 }
diff --git a/test/model/program/getteammemberpairs.php b/test/model/program/getteammemberpairs.php
index 6d96e43d82..99a50ca717 100755
--- a/test/model/program/getteammemberpairs.php
+++ b/test/model/program/getteammemberpairs.php
@@ -1,27 +1,50 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-5');
+$program->name->range('项目集1,项目集2,项目1,项目2,项目3');
+$program->type->range('program{2},project{3}');
+$program->status->range('wait');
+$program->parent->range('0,0,1,1,2');
+$program->grade->range('1{2},2{3}');
+$program->path->range('1,2,`1,3`,`1,4`,`2,5`')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(5);
+
+$team = zdTable('team');
+$team->id->range('1-5');
+$team->root->range('3-5');
+$team->type->range('project');
+$team->account->range('admin');
+$team->account->setFields(array(
+    array('field' => 'account1', 'range' => 'admin,test{4}'),
+    array('field' => 'account2', 'range' => '[],1-4'),
+));
+$team->gen(5);
+
 /**
 
 title=测试 programModel::getTeamMemberPairs();
 cid=1
 pid=1
 
-获取项目集1下所有团队成员数量 >> 19
-获取项目集2下所有团队成员数量 >> 19
-获取项目集1下所有团队成员真实姓名 >> P:产品经理92
-获取项目集2下所有团队成员真实姓名 >> U:测试83
+获取项目集1下所有团队成员数量     >> 5
+获取项目集2下所有团队成员数量     >> 2
+获取项目集1下所有团队成员真实姓名 >> A:admin
+获取项目集2下所有团队成员真实姓名 >> T:测试2
 
 */
 
-global $tester;
-$tester->loadModel('program');
-$teams1 = $tester->program->getTeamMemberPairs(1);
-$teams2 = $tester->program->getTeamMemberPairs(2);
+$programTester = new programTest();
+$teams1 = $programTester->getTeamMemberPairsTest(1);
+$teams2 = $programTester->getTeamMemberPairsTest(2);
 
-r(count($teams1)) && p()         && e('19');           // 获取项目集1下所有团队成员数量
-r(count($teams2)) && p()         && e('19');           // 获取项目集2下所有团队成员数量
-r($teams1)        && p('pm92')   && e('P:产品经理92'); // 获取项目集1下所有团队成员真实姓名
-r($teams2)        && p('user83') && e('U:测试83');     // 获取项目集2下所有团队成员真实姓名
\ No newline at end of file
+r(count($teams1)) && p()        && e('5');           // 获取项目集1下所有团队成员数量
+r(count($teams2)) && p()        && e('2');           // 获取项目集2下所有团队成员数量
+r($teams1)        && p('admin') && e('A:admin');     // 获取项目集1下所有团队成员真实姓名
+r($teams2)        && p('test2') && e('T:测试2');     // 获取项目集2下所有团队成员真实姓名
diff --git a/test/model/program/gettoppairs.php b/test/model/program/gettoppairs.php
index bfcb1e9dd3..9f7282aa28 100755
--- a/test/model/program/gettoppairs.php
+++ b/test/model/program/gettoppairs.php
@@ -22,9 +22,9 @@ title=测试 programModel::getTopPairs();
 cid=1
 pid=1
 
-获取系统中所有顶级项目集数量 >> 2
+获取系统中所有顶级项目集数量         >> 2
 获取系统中所有未关闭的顶级项目集数量 >> 1
-获取系统中所有顶级项目集数量 >> 2
+获取系统中所有顶级项目集数量         >> 2
 
 */
 

From 2a7e7b55e0b94c9b6407a1fc851561b8368eddab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=94=E4=BB=A4=E8=8C=82?= <xiaofeng993229@163.com>
Date: Thu, 5 Jan 2023 07:38:25 +0000
Subject: [PATCH 26/59] * Resolve bug #30923 , import bug erorr when chose
 mutilple branch product.

---
 module/bug/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 9bf3ff5a95..060992e9ab 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -205,7 +205,7 @@ $config->bug->datatable->fieldList['branch']['fixed']      = 'left';
 $config->bug->datatable->fieldList['branch']['width']      = '100';
 $config->bug->datatable->fieldList['branch']['required']   = 'no';
 $config->bug->datatable->fieldList['branch']['control']    = 'select';
-$config->bug->datatable->fieldList['branch']['dataSource'] = array('module' => 'bug', 'method' => 'getRelatedObjects', 'params' => 'branch&id,name');
+$config->bug->datatable->fieldList['branch']['dataSource'] = array('module' => 'branch', 'method' => 'getPairs', 'params' => '$productID');
 
 $config->bug->datatable->fieldList['type']['title']    = 'type';
 $config->bug->datatable->fieldList['type']['fixed']    = 'no';

From 21dedcfd1a81637008077b5458ec7915c556cd45 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 5 Jan 2023 15:43:47 +0800
Subject: [PATCH 27/59] * Fix bug#31504.

---
 module/task/view/lineareffort.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/view/lineareffort.html.php b/module/task/view/lineareffort.html.php
index 7922d41d7d..d841fd31a0 100644
--- a/module/task/view/lineareffort.html.php
+++ b/module/task/view/lineareffort.html.php
@@ -158,6 +158,6 @@ ksort($myOrders);
   </div>
 </div>
 <?php endif;?>
-<?php if($i > 4):?>
+<?php if(!empty($myCountList) and $i > 4):?>
 <style>#legendMyEffort > .table {margin-bottom: 5px;}</style>
 <?php endif;?>

From e62172bfaa0fd51dd31fc8e974a5f07a6c87bddf Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 15:51:44 +0800
Subject: [PATCH 28/59] * Update test case.

---
 test/class/program.class.php           | 16 +++++++++++
 test/model/program/getprojectstats.php | 37 +++++++++++++++++---------
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 9d375fc997..f8c43670f9 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -273,4 +273,20 @@ class programTest
     {
         return $this->program->getTeamMemberPairs($programID);
     }
+
+    /**
+     * Get project stats.
+     *
+     * @param  int    $programID
+     * @param  string $browseType
+     * @param  int    $queryID
+     * @param  string $orderBy
+     * @param  object $pager
+     * @access public
+     * @return void
+     */
+    public function getProjectStatsTest($programID = 0, $browseType = 'undone', $queryID = 0, $orderBy = 'id_desc', $pager = null)
+    {
+        return $this->program->getProjectStats($programID, $browseType, $queryID, $orderBy, $pager);
+    }
 }
diff --git a/test/model/program/getprojectstats.php b/test/model/program/getprojectstats.php
index 006020a677..fef452af4d 100755
--- a/test/model/program/getprojectstats.php
+++ b/test/model/program/getprojectstats.php
@@ -1,27 +1,40 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-5');
+$program->name->range('项目集1,项目集2,项目1,项目2,项目3');
+$program->type->range('program{2},project{3}');
+$program->status->range('doing{3},closed,doing');
+$program->parent->range('0,0,1,1,2');
+$program->grade->range('1{2},2{3}');
+$program->path->range('1,2,`1,3`,`1,4`,`2,5`')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(5);
+
 /**
 
 title=测试 programModel::getProjectStats();
 cid=1
 pid=1
 
-查看当前项目集下所有未完成的项目的个数 >> 7
-查看当前项目集下所有未完成的项目的个数 >> 7
-查看当前项目集下所有未完成的项目按照id倒序排的第一个项目集信息 >> 91,项目81
-查看当前项目集下所有未完成的项目按照id正序排的第一个项目集信息 >> 12,项目2
+查看当前项目集下所有未完成的项目的个数                         >> 1
+查看当前项目集下所有未完成的项目的个数                         >> 1
+查看当前项目集下所有未完成的项目按照id倒序排的第一个项目集信息 >> 3,项目1
+查看当前项目集下所有未完成的项目按照id正序排的第一个项目集信息 >> 5,项目3
 
 */
 
-global $tester;
-$tester->loadModel('program');
-$stats1 = $tester->program->getProjectStats(1);
-$stats2 = $tester->program->getProjectStats(2, 'undone', 0, 'id_asc', null);
+$programTester = new programTest();
 
-r(count($stats1))   && p()           && e('7');         // 查看当前项目集下所有未完成的项目的个数
-r(count($stats2))   && p()           && e('7');         // 查看当前项目集下所有未完成的项目的个数
-r(current($stats1)) && p('id,name')  && e('91,项目81'); // 查看当前项目集下所有未完成的项目按照id倒序排的第一个项目集信息
-r(current($stats2)) && p('id,name')  && e('12,项目2');  // 查看当前项目集下所有未完成的项目按照id正序排的第一个项目集信息
\ No newline at end of file
+$stats1 = $programTester->getProjectStatsTest(1);
+$stats2 = $programTester->getProjectStatsTest(2, 'undone', 0, 'id_asc', null);
+
+r(count($stats1))   && p()           && e('1');       // 查看当前项目集下所有未完成的项目的个数
+r(count($stats2))   && p()           && e('1');       // 查看当前项目集下所有未完成的项目的个数
+r(current($stats1)) && p('id,name')  && e('3,项目1'); // 查看当前项目集下所有未完成的项目按照id倒序排的第一个项目集信息
+r(current($stats2)) && p('id,name')  && e('5,项目3'); // 查看当前项目集下所有未完成的项目按照id正序排的第一个项目集信息

From c833eb5fde8f9d2cc38d07b0e5adff5d0eed794a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 15:59:54 +0800
Subject: [PATCH 29/59] * Add case of program model.

---
 test/class/program.class.php          | 14 +++++++++
 test/model/program/getparentpairs.php | 41 ++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index f8c43670f9..819c2f10c8 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -40,6 +40,20 @@ class programTest
         return $this->program->getPairsByList($programIDList);
     }
 
+    /**
+     * Get parent pairs.
+     *
+     * @param  string $model
+     * @param  string $mode
+     * @param  bool   $showRoot
+     * @access public
+     * @return array
+     */
+    public function getParentPairsTest($model = '', $mode = 'noclosed', $showRoot = true)
+    {
+        return $this->program->getParentPairs($model, $mode, $showRoot);
+    }
+
     /**
      * Test create program.
      *
diff --git a/test/model/program/getparentpairs.php b/test/model/program/getparentpairs.php
index e48ef60fa2..9eeaeabfaf 100755
--- a/test/model/program/getparentpairs.php
+++ b/test/model/program/getparentpairs.php
@@ -2,6 +2,25 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+su('admin');
+
+$program = zdTable('project');
+$program->id->range('1-10');
+$program->name->setFields(array(
+    array('field' => 'name1', 'range' => '项目集{5},项目{5}'),
+    array('field' => 'name2', 'range' => '1-5'),
+));
+$program->type->range('program{5},project{5}');
+$program->path->range('1-5,`1,6`,`2,7`,`3,8`,`4,9`,`5,10`')->prefix(',')->postfix(',');
+$program->grade->range('1{10},2{10}');
+$program->parent->range('0{5},1-5');
+$program->status->range('wait,doing,suspended,closed');
+$program->model->range('[]{5},scrum{2},waterfall{2},kanban');
+$program->openedBy->range('admin,test1');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->deleted->range('0{15},1{5}');
+$program->gen(10);
 
 /**
 
@@ -9,22 +28,22 @@ title=测试 programModel::getParentPairs();
 cid=1
 pid=1
 
-获取所有父项目集的数量                >> 7
-获取瀑布类型父项目集的数量            >> 1
-获取ID为1的父项目集的名称             >> /项目集1
-获取父项目集的名称显示根目录          >> /
+获取所有父项目集的数量 >> 5
+获取瀑布类型父项目集的数量 >> 1
+获取ID为1的父项目集的名称 >> /项目集1
+获取父项目集的名称显示根目录 >> 0
 获取ID为1的父项目集的名称不显示根目录 >> 项目集1
 
 */
 
-global $tester;
-$tester->loadModel('program');
-$program1 = $tester->program->getParentPairs();
-$program2 = $tester->program->getParentPairs('waterfall');
-$program3 = $tester->program->getParentPairs('', 'noclosed', false);
+$programTester = new programTest();
 
-r(count($program1))       && p()    && e('7');        // 获取所有父项目集的数量
+$program1 = $programTester->getParentPairsTest();
+$program2 = $programTester->getParentPairsTest('waterfall');
+$program3 = $programTester->getParentPairsTest('', 'noclosed', false);
+
+r(count($program1))       && p()    && e('5');        // 获取所有父项目集的数量
 r(count($program2))       && p()    && e('1');        // 获取瀑布类型父项目集的数量
 r($program1)              && p('1') && e('/项目集1'); // 获取ID为1的父项目集的名称
-r($program1)              && p('0') && e('/');        // 获取父项目集的名称显示根目录
+r(key($program1))         && p('0') && e('0');        // 获取父项目集的名称显示根目录
 r(array_shift($program3)) && p()    && e('项目集1');  // 获取ID为1的父项目集的名称不显示根目录

From a83105b42c9744104331cfa9e36855306fbc9a6a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 16:08:11 +0800
Subject: [PATCH 30/59] * Update test case.

---
 test/class/program.class.php          | 18 ++++++++++
 test/data/zt_config.sql               |  2 +-
 test/model/program/getprojectlist.php | 52 ++++++++++++++++-----------
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index f8c43670f9..79b47609d9 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -289,4 +289,22 @@ class programTest
     {
         return $this->program->getProjectStats($programID, $browseType, $queryID, $orderBy, $pager);
     }
+
+    /**
+     * Get project list.
+     *
+     * @param  int    $programID
+     * @param  string $browseType
+     * @param  int    $queryID
+     * @param  string $orderBy
+     * @param  int    $pager
+     * @param  int    $programTitle
+     * @param  int    $involved
+     * @access public
+     * @return void
+     */
+    public function getProjectListTest($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $involved = 0)
+    {
+        return $this->program->getProjectList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle, $involved);
+    }
 }
diff --git a/test/data/zt_config.sql b/test/data/zt_config.sql
index beb061fb3b..b056269b83 100644
--- a/test/data/zt_config.sql
+++ b/test/data/zt_config.sql
@@ -4,7 +4,7 @@ INSERT INTO `zt_config` (`id`, `vision`, `owner`, `module`, `section`, `key`, `v
 (2,	'rnd',	'system',	'common',	'',	'CRProduct',	'1'),
 (3,	'rnd',	'system',	'common',	'',	'CRExecution',	'1'),
 (4,	'rnd',	'system',	'custom',	'',	'URSR',	'2'),
-(9,	'rnd',	'system',	'common',	'global',	'mode',	'new'),
+(9,	'rnd',	'system',	'common',	'global',	'mode',	'ALM'),
 (6,	'rnd',	'system',	'project',	'',	'unitList',	'CNY,USD'),
 (7,	'rnd',	'system',	'project',	'',	'defaultCurrency',	'CNY'),
 (8,	'rnd',	'system',	'story',	'',	'reviewRules',	'allpass'),
diff --git a/test/model/program/getprojectlist.php b/test/model/program/getprojectlist.php
index d919f26e11..eda706a9e1 100755
--- a/test/model/program/getprojectlist.php
+++ b/test/model/program/getprojectlist.php
@@ -1,36 +1,48 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-5');
+$program->name->range('项目集1,项目集2,项目1,项目2,项目3');
+$program->type->range('program{2},project{3}');
+$program->status->range('doing{3},closed,doing');
+$program->parent->range('0,0,1,1,2');
+$program->grade->range('1{2},2{3}');
+$program->path->range('1,2,`1,3`,`1,4`,`2,5`')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(5);
+
 /**
 
 title=测试 programModel::getProjectList();
 cid=1
 pid=1
 
-获取所有项目列表数量 >> 110
-获取未完成项目列表数量 >> 88
-带项目集名称的项目列表数量 >> 88
-获取我参与的项目列表数量 >> 1
-不带项目集名称的项目名称 >> 项目2
-带项目集名称的项目名称 >> 项目集2/项目2
-我参与的项目的名称 >> 项目集1/项目1
+获取所有项目列表数量       >> 3
+获取未完成项目列表数量     >> 2
+带项目集名称的项目列表数量 >> 2
+获取我参与的项目列表数量   >> 1
+不带项目集名称的项目名称   >> 项目2
+带项目集名称的项目名称     >> 项目集2/项目3
+我参与的项目的名称         >> 项目集1/项目1
 
 */
 
-global $tester;
-$tester->loadModel('program');
+$programTester = new programTest();
 
-$allProjects         = $tester->program->getProjectList(0);
-$undoneProjects      = $tester->program->getProjectList(0, 'undone');
-$withProgramProjects = $tester->program->getProjectList(0, 'undone', 0, 'id_desc', null, 1);
-$involvedProjects    = $tester->program->getProjectList(0, 'undone', 0, 'id_desc', null, 1, true);
+$allProjects         = $programTester->getProjectListTest(0);
+$undoneProjects      = $programTester->getProjectListTest(0, 'undone');
+$withProgramProjects = $programTester->getProjectListTest(0, 'undone', 0, 'id_desc', null, 1);
+$involvedProjects    = $programTester->getProjectListTest(0, 'undone', 0, 'id_desc', null, 1, true);
 
-r(count($allProjects))         && p() && e('110');                     // 获取所有项目列表数量
-r(count($undoneProjects))      && p() && e('88');                      // 获取未完成项目列表数量
-r(count($withProgramProjects)) && p() && e('88');                      // 带项目集名称的项目列表数量
-r(count($involvedProjects))    && p() && e('1');                       // 获取我参与的项目列表数量
-r($allProjects)                && p('12:name') && e('项目2');          // 不带项目集名称的项目名称 
-r($withProgramProjects)        && p('12:name') && e('项目集2/项目2');  // 带项目集名称的项目名称
-r($involvedProjects)           && p('11:name') && e('项目集1/项目1');  // 我参与的项目的名称
\ No newline at end of file
+r(count($allProjects))         && p() && e('3');                     // 获取所有项目列表数量
+r(count($undoneProjects))      && p() && e('2');                     // 获取未完成项目列表数量
+r(count($withProgramProjects)) && p() && e('2');                     // 带项目集名称的项目列表数量
+r(count($involvedProjects))    && p() && e('1');                     // 获取我参与的项目列表数量
+r($allProjects)                && p('4:name') && e('项目2');         // 不带项目集名称的项目名称
+r($withProgramProjects)        && p('5:name') && e('项目集2/项目3'); // 带项目集名称的项目名称
+r($involvedProjects)           && p('3:name') && e('项目集1/项目1'); // 我参与的项目的名称

From df96b3f0b011bfdcca6b6e008c206eb48b58ac96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=94=E4=BB=A4=E8=8C=82?= <xiaofeng993229@163.com>
Date: Thu, 5 Jan 2023 08:23:06 +0000
Subject: [PATCH 31/59] * Init fliter project test case.

---
 config/filter.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/filter.php b/config/filter.php
index 4fa49fa310..78798365c7 100755
--- a/config/filter.php
+++ b/config/filter.php
@@ -124,6 +124,7 @@ $filter->project->story           = new stdclass();
 $filter->project->export          = new stdclass();
 $filter->project->task            = new stdclass();
 $filter->project->execution       = new stdclass();
+$filter->project->testcase        = new stdclass();
 $filter->projectstory->story      = new stdclass();
 $filter->qa->default              = new stdclass();
 $filter->story->create            = new stdclass();

From a9d9db278298e17d4107318fbcdc784e3badf61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 16:23:50 +0800
Subject: [PATCH 32/59] * Add case of program model.

---
 test/class/program.class.php          | 12 ++++++++++
 test/model/program/getparentpairs.php |  2 +-
 test/model/program/getparentpm.php    | 34 ++++++++++++++++++++-------
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 52116f98f8..c78cfb483b 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -74,6 +74,18 @@ class programTest
         return $program;
     }
 
+    /**
+     * Get parent PM.
+     *
+     * @param  array  $programIdList
+     * @access public
+     * @return array
+     */
+    public function getParentPMTest($programIdList)
+    {
+        return $this->program->getParentPM($programIdList);
+    }
+
     /**
      * Create stakeholder.
      *
diff --git a/test/model/program/getparentpairs.php b/test/model/program/getparentpairs.php
index 9eeaeabfaf..c9b05b0e5d 100755
--- a/test/model/program/getparentpairs.php
+++ b/test/model/program/getparentpairs.php
@@ -12,7 +12,7 @@ $program->name->setFields(array(
 ));
 $program->type->range('program{5},project{5}');
 $program->path->range('1-5,`1,6`,`2,7`,`3,8`,`4,9`,`5,10`')->prefix(',')->postfix(',');
-$program->grade->range('1{10},2{10}');
+$program->grade->range('1{5},2{5}');
 $program->parent->range('0{5},1-5');
 $program->status->range('wait,doing,suspended,closed');
 $program->model->range('[]{5},scrum{2},waterfall{2},kanban');
diff --git a/test/model/program/getparentpm.php b/test/model/program/getparentpm.php
index 6438595743..c73fac8439 100755
--- a/test/model/program/getparentpm.php
+++ b/test/model/program/getparentpm.php
@@ -1,8 +1,25 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-10');
+$program->name->range('1-10')->prefix('项目集');
+$program->type->range('program');
+$program->path->range('1-5,`1,6`,`2,7`,`3,8`,`4,9`,`5,10`')->prefix(',')->postfix(',');
+$program->grade->range('1{5},2{5}');
+$program->parent->range('0{5},1-5');
+$program->status->range('wait,doing,suspended,closed');
+$program->openedBy->range('admin,test1');
+$program->pm->range('admin,test1');
+$program->acl->range('private');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->deleted->range('0{15},1{5}');
+$program->gen(10);
+
 /**
 
 title=测试 programModel::getParentPM();
@@ -10,17 +27,16 @@ cid=1
 pid=1
 
 获取父项目集的负责人数量 >> 2
-获取父项目集的负责人account >> pm2
-获取父项目集的负责人account >> pm3
+获取父项目集的负责人account >> admin
+获取父项目集的负责人account >> test1
 
 */
 
-global $tester;
-$tester->loadModel('program');
+$programTester = new programTest();
 
-$programIdList = array(11, 12, 13);
-$parentPM = $tester->program->getParentPM($programIdList);
+$programIdList = array(5, 6, 7);
+$parentPM      = $programTester->getParentPMTest($programIdList);
 
-r(count($parentPM)) && p()         && e('2');   // 获取父项目集的负责人数量
-r($parentPM)        && p('12:pm2') && e('pm2'); // 获取父项目集的负责人account
-r($parentPM)        && p('13:pm3') && e('pm3'); // 获取父项目集的负责人account
\ No newline at end of file
+r(count($parentPM)) && p()          && e('2');     // 获取父项目集的负责人数量
+r($parentPM)        && p('6:admin') && e('admin'); // 获取父项目集的负责人account
+r($parentPM)        && p('7:test1') && e('test1'); // 获取父项目集的负责人account

From 83793d8d61bd5c8ca2dc1e0fd11ac3d74a3f0b33 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 5 Jan 2023 08:27:12 +0000
Subject: [PATCH 33/59] * Add the unit testcase of identify method.

---
 test/model/user/identify.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/test/model/user/identify.php b/test/model/user/identify.php
index a879669a86..d6de21cd9d 100755
--- a/test/model/user/identify.php
+++ b/test/model/user/identify.php
@@ -4,13 +4,20 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+$user = zdTable('user');
+$user->id->range('1-100');
+$user->account->range('1-100')->prefix('dev');
+$user->password->range('f8e41d6c31824c01e5d67c61a8ae49e9,e10adc3949ba59abbe56e057f20f883e');
+$user->realname->range('1-100')->prefix("开发");
+$user->gen(50);
+
 /**
 
 title=测试 userModel->identify();
 cid=1
 pid=1
 
-用户名密码皆正确，返回验证登录的用户 >> admin
+用户名密码皆正确，返回验证登录的用户真实姓名 >> 开发1
 验证一个不存在的用户，返回空 >> 0
 验证一个不传用户名和密码的用户，返回空 >> 0
 
@@ -18,6 +25,6 @@ pid=1
 
 $user = new userTest();
 
-r($user->identifyTest('admin', '78302615c8b79cac8df6d2607f8a83ee'))    && p('realname') && e('admin'); //用户名密码皆正确，返回验证登录的用户
+r($user->identifyTest('dev1', 'f8e41d6c31824c01e5d67c61a8ae49e9'))     && p('realname') && e('开发1'); //用户名密码皆正确，返回验证登录的用户真实姓名
 r($user->identifyTest('asdjaf12', '78302615c8b79cac8df6d2607f8a83ee')) && p()           && e('0');     //验证一个不存在的用户，返回空
-r($user->identifyTest('', ''))                                         && p()           && e('0');     //验证一个不传用户名和密码的用户，返回空
\ No newline at end of file
+r($user->identifyTest('', ''))                                         && p()           && e('0');     //验证一个不传用户名和密码的用户，返回空

From 0f871753a55d757ab460bde674ecde6b76b0fd2a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 16:36:53 +0800
Subject: [PATCH 34/59] * Update test case.

---
 test/class/program.class.php           | 19 ++++++++---
 test/model/program/getprogresslist.php | 45 ++++++++++++++++++++------
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 52116f98f8..e65b140cd3 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -258,7 +258,7 @@ class programTest
      * @param  string $mode
      * @param  bool   $isQueryAll
      * @access public
-     * @return void
+     * @return array
      */
     public function getTopPairsTest($model = '', $mode = '', $isQueryAll = false)
     {
@@ -281,7 +281,7 @@ class programTest
      *
      * @param  int    $programID
      * @access public
-     * @return void
+     * @return array
      */
     public function getTeamMemberPairsTest($programID)
     {
@@ -297,7 +297,7 @@ class programTest
      * @param  string $orderBy
      * @param  object $pager
      * @access public
-     * @return void
+     * @return array
      */
     public function getProjectStatsTest($programID = 0, $browseType = 'undone', $queryID = 0, $orderBy = 'id_desc', $pager = null)
     {
@@ -315,10 +315,21 @@ class programTest
      * @param  int    $programTitle
      * @param  int    $involved
      * @access public
-     * @return void
+     * @return array
      */
     public function getProjectListTest($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $involved = 0)
     {
         return $this->program->getProjectList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle, $involved);
     }
+
+    /**
+     * Get progress list.
+     *
+     * @access public
+     * @return array
+     */
+    public function getProgressListTest()
+    {
+        return $this->program->getProgressList();
+    }
 }
diff --git a/test/model/program/getprogresslist.php b/test/model/program/getprogresslist.php
index 3e5fdb0f6e..98942728ad 100755
--- a/test/model/program/getprogresslist.php
+++ b/test/model/program/getprogresslist.php
@@ -1,24 +1,51 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 su('admin');
 
+$program = zdTable('project');
+$program->id->range('1-8');
+$program->name->setFields(array(
+    array('field' => 'name1', 'range' => '项目集{2},项目{3},迭代{3}'),
+    array('field' => 'name2', 'range' => '1-8')
+));
+$program->type->range('program{2},project{3},sprint{3}');
+$program->status->range('doing');
+$program->parent->range('0,0,1,1,2,3,4,5');
+$program->grade->range('1{2},2{3},1{3}');
+$program->project->range('0{5},3-5');
+$program->path->range('1,2,`1,3`,`1,4`,`2,5`,`3,6`,`4,7`,`5,8`')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20230212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(8);
+
+$task = zdTable('task');
+$task->name->prefix('任务')->range('1-3');
+$task->project->range('3-5');
+$task->execution->range('6-8');
+$task->estimate->range('6-8');
+$task->consumed->range('1,3,2');
+$task->left->range('5,4,6');
+$task->status->range('doing');
+$task->assignedTo->range('admin');
+$task->gen(3);
+
 /**
 
 title=测试 programModee::getProgressList();
 cid=1
 pid=1
 
-获取项目和项目集的个数 >> 120
-获取id=1的项目的进度 >> 41
-获取id=11的项目集的进度 >> 45
+获取项目和项目集的个数 >> 5
+获取id=2的项目的进度   >> 25
+获取id=4的项目集的进度 >> 43
 
 */
 
-global $tester;
-$tester->loadModel('program');
-$progressList = $tester->program->getProgressList();
+$programTester = new programTest();
+$progressList = $programTester->getProgressListTest();
 
-r(count($progressList)) && p()     && e('120');  // 获取项目和项目集的个数
-r($progressList)        && p('1')  && e('41');   // 获取id=1的项目的进度
-r($progressList)        && p('11') && e('45');   // 获取id=11的项目集的进度
\ No newline at end of file
+r(count($progressList)) && p()    && e('5');  // 获取项目和项目集的个数
+r($progressList)        && p('2') && e('25'); // 获取id=2的项目的进度
+r($progressList)        && p('4') && e('43'); // 获取id=4的项目集的进度

From 3d3530ab518f01110c6d316f47ce71a3bf5d9ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Thu, 5 Jan 2023 16:38:10 +0800
Subject: [PATCH 35/59] * Add case of program model.

---
 test/class/program.class.php           | 17 ++++++++++
 test/model/program/getproductpairs.php | 47 +++++++++++++++++++-------
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index a42f1e150b..79380e1b3d 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -54,6 +54,23 @@ class programTest
         return $this->program->getParentPairs($model, $mode, $showRoot);
     }
 
+    /**
+     * Get the product associated with the program.
+     *
+     * @param  int          $programID
+     * @param  string       $mode
+     * @param  string       $status
+     * @param  string|array $append
+     * @param  int|string   $shadow
+     * @param  bool         $withProgram
+     * @access public
+     * @return array
+     */
+    public function getProductPairsTest($programID = 0, $mode = 'assign', $status = 'all', $append = '', $shadow = 0, $withProgram = false)
+    {
+        return $this->program->getProductPairs($programID, $mode, $status, $append, $shadow, $withProgram);
+    }
+
     /**
      * Test create program.
      *
diff --git a/test/model/program/getproductpairs.php b/test/model/program/getproductpairs.php
index d65c5f86b8..286159d5bd 100755
--- a/test/model/program/getproductpairs.php
+++ b/test/model/program/getproductpairs.php
@@ -1,6 +1,29 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+su('admin');
+
+/* Create program data. */
+$program = zdTable('project');
+$program->id->range('1');
+$program->name->range('项目集1');
+$program->type->range('program');
+$program->grade->range('1');
+$program->path->range('1')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(1);
+
+/* Create product data. */
+$product = zdTable('product');
+$product->id->range('1-10');
+$product->name->range('1-10')->prefix('产品');
+$product->program->range('1');
+$product->type->range('normal');
+$product->status->range('normal,closed');
+$product->vision->range('rnd');
+$product->gen(10);
 
 /**
 
@@ -8,21 +31,19 @@ title=测试 programModel::getProductPairs();
 cid=1
 pid=1
 
-获取项目集1下的所有产品数量 >> 6
-根据项目集ID获取关联产品名字 >> 已关闭的正常产品24
-获取项目集1下的未关闭的产品数量 >> 4
-根据项目或项目集ID获取关联产品详情 >> 已关闭的正常产品24
+获取项目集1下的所有产品数量 >> 10
+根据项目集ID获取关联产品名字 >> 产品2
+获取项目集1下的未关闭的产品数量 >> 5
+根据项目或项目集ID获取关联产品详情 >> 产品3
 
 */
 
-global $tester;
-$tester->loadModel('program');
+$programTester = new programTest();
 
-$products1 = $tester->program->getProductPairs(1, 'assign', 'all');
-$products2 = $tester->program->getProductPairs(1, 'assign', 'noclosed');
+$products1 = $programTester->getProductPairsTest(1, 'assign', 'all');
+$products2 = $programTester->getProductPairsTest(1, 'assign', 'noclosed');
 
-r(count($products1)) && p()     && e('6'); //获取项目集1下的所有产品数量
-r($products1)        && p('24') && e('已关闭的正常产品24'); //根据项目集ID获取关联产品名字
-
-r(count($products2)) && p()     && e('4'); //获取项目集1下的未关闭的产品数量
-r($products2)        && p('24') && e('已关闭的正常产品24'); //根据项目或项目集ID获取关联产品详情
\ No newline at end of file
+r(count($products1)) && p()    && e('10');    // 获取项目集1下的所有产品数量
+r($products1)        && p('2') && e('产品2'); // 根据项目集ID获取关联产品名字
+r(count($products2)) && p()    && e('5');     // 获取项目集1下的未关闭的产品数量
+r($products2)        && p('3') && e('产品3'); // 根据项目或项目集ID获取关联产品详情

From 77bfd2a40e51e2f54567a537e653c3927391084d Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 5 Jan 2023 16:51:37 +0800
Subject: [PATCH 36/59] * Update test case.

---
 test/model/program/gettreemenu.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/model/program/gettreemenu.php b/test/model/program/gettreemenu.php
index e9a4504fc4..9193622755 100755
--- a/test/model/program/gettreemenu.php
+++ b/test/model/program/gettreemenu.php
@@ -21,10 +21,11 @@ title=测试 programModel::getTreeMenu();
 cid=1
 pid=1
 
-查看返回的字符个数 >> 396
+查看返回的字符个数 >> 项目集1项目集2
 
 */
 $programTester = new programTest();
-$programs1 = $programTester->getTreeMenuTest(1);
+$programs1     = $programTester->getTreeMenuTest(1);
+$programs1 = preg_replace('/\s*/', '', strip_tags($programs1));
 
-r(strlen($programs1)) && p() && e('396'); // 查看返回的字符个数
+r($programs1) && p() && e('项目集1项目集2'); // 查看返回的字符个数

From 01821a5ae6b14dce39b7770241d6452f5a3b05df Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 6 Jan 2023 00:40:32 +0000
Subject: [PATCH 37/59] * Delete story #40806 from changelog.

---
 doc/CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 66e44c5aca..222f92be77 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -27,7 +27,6 @@
 40812 将流程图融入使用帮助中的使用教程中
 40809 地盘仪表盘删除流程图区块，增加使用帮助区块
 40808 新用户登录禅道后，删除原弹窗引导
-40806 欢迎总览页面中支持试用的版本类型调整
 40801 欢迎总览页面改版
 40797 欢迎总览页面背景颜色调整
 40615 优化创建执行节点的交互

From 49f6e0cc93b255e7ea88b06b8750bc0bf359a430 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 6 Jan 2023 01:32:36 +0000
Subject: [PATCH 38/59]  * Finish task #82070.

---
 module/kanban/lang/de.php    | 1 +
 module/kanban/lang/en.php    | 1 +
 module/kanban/lang/fr.php    | 1 +
 module/kanban/lang/zh-cn.php | 1 +
 4 files changed, 4 insertions(+)

diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php
index da01b11006..68a5701a90 100644
--- a/module/kanban/lang/de.php
+++ b/module/kanban/lang/de.php
@@ -395,6 +395,7 @@ $lang->kanbancard->beginAndEnd     = 'Begin & End';
 $lang->kanbancard->begin           = 'Begin';
 $lang->kanbancard->end             = 'End';
 $lang->kanbancard->pri             = 'Priority';
+$lang->kanbancard->status          = 'Status';
 $lang->kanbancard->progress        = 'Progress';
 $lang->kanbancard->desc            = 'Description';
 $lang->kanbancard->estimate        = 'Estimate';
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 363486a6aa..1b65882e93 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -395,6 +395,7 @@ $lang->kanbancard->beginAndEnd     = 'Begin & End';
 $lang->kanbancard->begin           = 'Begin';
 $lang->kanbancard->end             = 'End';
 $lang->kanbancard->pri             = 'Priority';
+$lang->kanbancard->status          = 'Status';
 $lang->kanbancard->progress        = 'Progress';
 $lang->kanbancard->desc            = 'Description';
 $lang->kanbancard->estimate        = 'Estimate';
diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php
index 412d674374..72ed3605a1 100644
--- a/module/kanban/lang/fr.php
+++ b/module/kanban/lang/fr.php
@@ -395,6 +395,7 @@ $lang->kanbancard->beginAndEnd     = 'Begin & End';
 $lang->kanbancard->begin           = 'Begin';
 $lang->kanbancard->end             = 'End';
 $lang->kanbancard->pri             = 'Priority';
+$lang->kanbancard->status          = 'Status';
 $lang->kanbancard->progress        = 'Progress';
 $lang->kanbancard->desc            = 'Description';
 $lang->kanbancard->estimate        = 'Estimate';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index fd5b484c6e..95047c31a1 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -395,6 +395,7 @@ $lang->kanbancard->beginAndEnd     = '起止日期';
 $lang->kanbancard->begin           = '预计开始';
 $lang->kanbancard->end             = '截止日期';
 $lang->kanbancard->pri             = '优先级';
+$lang->kanbancard->status          = '状态';
 $lang->kanbancard->progress        = '进度';
 $lang->kanbancard->desc            = '描述';
 $lang->kanbancard->estimate        = '预计';

From 8c2a2ad0bffd94a45630d81bd474db0694b1767d Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycorp.ltd>
Date: Fri, 6 Jan 2023 09:33:53 +0800
Subject: [PATCH 39/59] * Fix init data of user and config.

---
 test/data/user.yaml            | 2 +-
 test/data/zentao/processor.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/data/user.yaml b/test/data/user.yaml
index 9891eb8a6d..c2d29a85be 100644
--- a/test/data/user.yaml
+++ b/test/data/user.yaml
@@ -42,7 +42,7 @@ fields:
     note: "真实姓名"
     fields:
     - field: realname1
-      range: admin,用户,测试{100},开发{100},项目经理{100},产品经理{100},研发主管{100},产品主管{100},测试主管{100},高层管理{100},用户{100},其他{100},A,BB,CCC,非常长非常长的用户名怎么这么长?
+      range: admin,用户{99},测试{100},开发{100},项目经理{100},产品经理{100},研发主管{100},产品主管{100},测试主管{100},高层管理{100},外用户{100},其他{100},A,BB,CCC,非常长非常长的用户名怎么这么长?
     - field: realname2
       range: [],1-99,1-100,1-100,1-100,1-100,1-100,1-100,1-100,1-100,1-100,1-100,[]{4}
   - field: nickname
diff --git a/test/data/zentao/processor.php b/test/data/zentao/processor.php
index 59a6710eee..864af047f9 100644
--- a/test/data/zentao/processor.php
+++ b/test/data/zentao/processor.php
@@ -52,7 +52,6 @@ class Processor
         $this->initTest();
         $this->initTodo();
         $this->initSonPlan();
-        $this->initBassicSql();
 
         $this->dao->commit();
     }
@@ -298,7 +297,6 @@ class Processor
     {
         global $app;
         $sqlRoot = $app->getAppRoot();
-        $this->dao->exec(file_get_contents($sqlRoot . '/data/zt_config.sql'));
         $this->dao->exec(file_get_contents($sqlRoot . '/data/zt_block.sql'));
         $this->dao->exec(file_get_contents($sqlRoot . '/data/zt_lang.sql'));
         $this->dao->exec(file_get_contents($sqlRoot . '/data/zt_cron.sql'));

From 0338be7f3d8741dd86b17b3c06995e7b15af22ed Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 09:40:55 +0800
Subject: [PATCH 40/59] * Update user create.

---
 test/class/program.class.php                  | 13 +++++
 test/model/program/getbudgetleft.php          |  4 +-
 test/model/program/getstakeholders.php        | 45 +++++++++++++-----
 .../program/getstakeholdersbyprograms.php     | 47 ++++++++++++-------
 test/model/program/getteammemberpairs.php     | 11 +++--
 5 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 79380e1b3d..8e5592024d 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -361,4 +361,17 @@ class programTest
     {
         return $this->program->getProgressList();
     }
+
+    /**
+     * Get stakeholders.
+     *
+     * @param  int    $programID
+     * @param  string $orderBy
+     * @access public
+     * @return array
+     */
+    public function getStakeholdersTest($programID, $orderBy = 'id_desc')
+    {
+        return $this->program->getStakeholders($programID, $orderBy);
+    }
 }
diff --git a/test/model/program/getbudgetleft.php b/test/model/program/getbudgetleft.php
index 4db0a00893..3998bd1e71 100755
--- a/test/model/program/getbudgetleft.php
+++ b/test/model/program/getbudgetleft.php
@@ -26,8 +26,8 @@ pid=1
 */
 
 $programTester = new programTest();
-$result1  = $programTester->getBudgetLeftTest(1);
-$result2  = $programTester->getBudgetLeftTest(2);
+$result1       = $programTester->getBudgetLeftTest(1);
+$result2       = $programTester->getBudgetLeftTest(2);
 
 r($result1) && p() && e('900000');  // 查看项目集1的所有父项目集的预算剩余
 r($result2) && p() && e('899900');  // 查看项目集2的所有父项目集的预算剩余
diff --git a/test/model/program/getstakeholders.php b/test/model/program/getstakeholders.php
index 9b2b9dbf91..2a769ee78c 100755
--- a/test/model/program/getstakeholders.php
+++ b/test/model/program/getstakeholders.php
@@ -1,27 +1,46 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
-su('admin');
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
 
+$program = zdTable('project');
+$program->id->range('1,2');
+$program->name->range('父项目集1,父项目集2');
+$program->type->range('program');
+$program->budget->range('900000,899900');
+$program->path->range('1,2')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(2);
+
+zdTable('user')->gen(5);
+
+$stakeholder = zdTable('stakeholder');
+$stakeholder->objectID->range('1,2');
+$stakeholder->objectType->range('program');
+$stakeholder->type->range('inside');
+$stakeholder->user->range('admin,user1,user2');
+$stakeholder->gen(3);
+
+su('admin');
 /**
 
 title=测试 programModel::getStakeholders();
 cid=1
 pid=1
 
-获取干系人数量 >> 3
-获取干系人数量 >> 3
-id倒序排，获取第一个干系人真实姓名 >> 测试17
-id正序排，获取第一个干系人真实姓名 >> 测试19
+获取干系人数量                     >> 2
+获取干系人数量                     >> 1
+id倒序排，获取第一个干系人真实姓名 >> 测试2
+id正序排，获取第一个干系人真实姓名 >> 用户1
 
 */
 
-global $tester;
-$tester->loadModel('program');
-$stakeholders1 = $tester->program->getStakeholders(2, 'id_desc');
-$stakeholders2 = $tester->program->getStakeholders(2, 'id_asc');
+$programTester = new programTest();
+$stakeholders1 = $programTester->getStakeholdersTest(1, 'id_desc');
+$stakeholders2 = $programTester->getStakeholdersTest(2, 'id_asc');
 
-r(count($stakeholders1)) && p()             && e('3');      // 获取干系人数量
-r(count($stakeholders2)) && p()             && e('3');      // 获取干系人数量
-r($stakeholders1)        && p('0:realname') && e('测试17'); // id倒序排，获取第一个干系人真实姓名
-r($stakeholders2)        && p('0:realname') && e('测试19'); // id正序排，获取第一个干系人真实姓名
\ No newline at end of file
+r(count($stakeholders1)) && p()             && e('2');     // 获取干系人数量
+r(count($stakeholders2)) && p()             && e('1');     // 获取干系人数量
+r($stakeholders1)        && p('0:realname') && e('测试2'); // id倒序排，获取第一个干系人真实姓名
+r($stakeholders2)        && p('0:realname') && e('用户1'); // id正序排，获取第一个干系人真实姓名
diff --git a/test/model/program/getstakeholdersbyprograms.php b/test/model/program/getstakeholdersbyprograms.php
index 44c4fd3bee..9c0a2eb2ed 100755
--- a/test/model/program/getstakeholdersbyprograms.php
+++ b/test/model/program/getstakeholdersbyprograms.php
@@ -1,6 +1,27 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+
+$program = zdTable('project');
+$program->id->range('1,2');
+$program->name->range('父项目集1,父项目集2');
+$program->type->range('program');
+$program->budget->range('900000,899900');
+$program->path->range('1,2')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(2);
+
+zdTable('user')->gen(5);
+
+$stakeholder = zdTable('stakeholder');
+$stakeholder->objectID->range('1,2');
+$stakeholder->objectType->range('program');
+$stakeholder->type->range('inside');
+$stakeholder->user->range('admin,user1,user2');
+$stakeholder->gen(3);
+
 su('admin');
 
 /**
@@ -9,25 +30,19 @@ title=测试 programModel::getStakeholdersByPrograms();
 cid=1
 pid=1
 
-获取项目集2的干系人名单 >> user19
-获取项目集2的干系人名单 >> user18
-获取项目集2的干系人名单 >> user17
-获取项目集2和项目集3的干系人名单 >> user19
-获取项目集2和项目集3的干系人名单 >> user18
-获取项目集2和项目集3的干系人名单 >> user17
-获取项目集2的干系人个数 >> 3
-获取项目集2、3的干系人个数 >> 6
+获取项目集1的干系人名单          >> admin
+获取项目集2的干系人名单          >> user1
+获取项目集1和项目集2的干系人名单 >> admin
+获取项目集1的干系人个数          >> 2
+获取项目集1、2的干系人个数       >> 3
 
 */
 
 global $tester;
 $tester->loadModel('program');
 
-r($tester->program->getStakeholdersByPrograms('2'))          && p('0:account') && e('user19'); // 获取项目集2的干系人名单
-r($tester->program->getStakeholdersByPrograms('2'))          && p('1:account') && e('user18'); // 获取项目集2的干系人名单
-r($tester->program->getStakeholdersByPrograms('2'))          && p('2:account') && e('user17'); // 获取项目集2的干系人名单
-r($tester->program->getStakeholdersByPrograms('2,3'))        && p('0:account') && e('user19'); // 获取项目集2和项目集3的干系人名单
-r($tester->program->getStakeholdersByPrograms('2,3'))        && p('1:account') && e('user18'); // 获取项目集2和项目集3的干系人名单
-r($tester->program->getStakeholdersByPrograms('2,3'))        && p('2:account') && e('user17'); // 获取项目集2和项目集3的干系人名单
-r(count($tester->program->getStakeholdersByPrograms('2')))   && p('')          && e('3');      // 获取项目集2的干系人个数
-r(count($tester->program->getStakeholdersByPrograms('2,3'))) && p('')          && e('6');      // 获取项目集2、3的干系人个数
\ No newline at end of file
+r($tester->program->getStakeholdersByPrograms('1'))          && p('0:account') && e('admin'); // 获取项目集1的干系人名单
+r($tester->program->getStakeholdersByPrograms('2'))          && p('0:account') && e('user1'); // 获取项目集2的干系人名单
+r($tester->program->getStakeholdersByPrograms('1,2'))        && p('0:account') && e('admin'); // 获取项目集1和项目集2的干系人名单
+r(count($tester->program->getStakeholdersByPrograms('1')))   && p('')          && e('2');     // 获取项目集1的干系人个数
+r(count($tester->program->getStakeholdersByPrograms('1,2'))) && p('')          && e('3');     // 获取项目集1、2的干系人个数
diff --git a/test/model/program/getteammemberpairs.php b/test/model/program/getteammemberpairs.php
index 99a50ca717..020ec104e8 100755
--- a/test/model/program/getteammemberpairs.php
+++ b/test/model/program/getteammemberpairs.php
@@ -2,7 +2,6 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
-su('admin');
 
 $program = zdTable('project');
 $program->id->range('1-5');
@@ -22,11 +21,15 @@ $team->root->range('3-5');
 $team->type->range('project');
 $team->account->range('admin');
 $team->account->setFields(array(
-    array('field' => 'account1', 'range' => 'admin,test{4}'),
+    array('field' => 'account1', 'range' => 'admin,user{4}'),
     array('field' => 'account2', 'range' => '[],1-4'),
 ));
 $team->gen(5);
 
+zdTable('user')->gen(5);
+
+su('admin');
+
 /**
 
 title=测试 programModel::getTeamMemberPairs();
@@ -36,7 +39,7 @@ pid=1
 获取项目集1下所有团队成员数量     >> 5
 获取项目集2下所有团队成员数量     >> 2
 获取项目集1下所有团队成员真实姓名 >> A:admin
-获取项目集2下所有团队成员真实姓名 >> T:测试2
+获取项目集2下所有团队成员真实姓名 >> U:测试2
 
 */
 
@@ -47,4 +50,4 @@ $teams2 = $programTester->getTeamMemberPairsTest(2);
 r(count($teams1)) && p()        && e('5');           // 获取项目集1下所有团队成员数量
 r(count($teams2)) && p()        && e('2');           // 获取项目集2下所有团队成员数量
 r($teams1)        && p('admin') && e('A:admin');     // 获取项目集1下所有团队成员真实姓名
-r($teams2)        && p('test2') && e('T:测试2');     // 获取项目集2下所有团队成员真实姓名
+r($teams2)        && p('user2') && e('U:测试2');     // 获取项目集2下所有团队成员真实姓名

From 0875144941ec683efc69733d42298a8c5e8f425c Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 10:05:48 +0800
Subject: [PATCH 41/59] * Add test case.

---
 test/class/program.class.php        | 13 +++++++++
 test/model/program/accessdenied.php | 21 ++++++++++++++
 test/model/program/savestate.php    | 44 +++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 test/model/program/accessdenied.php
 create mode 100644 test/model/program/savestate.php

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 8e5592024d..3078f1ed6a 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -374,4 +374,17 @@ class programTest
     {
         return $this->program->getStakeholders($programID, $orderBy);
     }
+
+    /**
+     * Test save state.
+     *
+     * @param  int    $programID
+     * @param  array  $programs
+     * @access public
+     * @return array
+     */
+    public function saveStateTest($programID = 0, $programs = array())
+    {
+        return $this->program->saveState($programID, $programs);
+    }
 }
diff --git a/test/model/program/accessdenied.php b/test/model/program/accessdenied.php
new file mode 100644
index 0000000000..414a058e13
--- /dev/null
+++ b/test/model/program/accessdenied.php
@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+
+/**
+
+title=测试 programModel::getStakeholdersByPrograms();
+cid=1
+pid=1
+
+权限不足跳转 >> html
+
+*/
+
+global $tester;
+$tester->loadModel('program');
+ob_start();
+$tester->program->accessDenied();
+$result = ob_get_clean();
+
+r(substr($result, 1, 4)) && p() && e('html'); // 权限不足跳转
diff --git a/test/model/program/savestate.php b/test/model/program/savestate.php
new file mode 100644
index 0000000000..b4aa6666df
--- /dev/null
+++ b/test/model/program/savestate.php
@@ -0,0 +1,44 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+
+$program = zdTable('project');
+$program->id->range('1,2');
+$program->name->range('父项目集1,父项目集2');
+$program->type->range('program');
+$program->budget->range('900000,899900');
+$program->path->range('1,2')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(2);
+
+su('admin');
+/**
+
+title=测试 programModel::saveState();
+cid=1
+pid=1
+
+项目集存在且正常访问                   >> html
+项目集不存在                           >> 0
+项目集存在，但不在可以查看的项目集列表 >> 1
+项目集存在，且在可以查看的项目集列表   >> 2
+项目集不存在，且有可以查看的项目集列表 >> 2
+
+*/
+
+$programTester = new programTest();
+ob_start();
+$programTester->saveStateTest(1);
+$program1 = ob_get_clean();
+$program2 = $programTester->saveStateTest(0);
+$program3 = $programTester->saveStateTest(1, array(1 => ''));
+$program4 = $programTester->saveStateTest(3, array(2 => ''));
+$program5 = $programTester->saveStateTest(0, array(2 => ''));
+
+r(substr($program1, 1, 4)) && p() && e('html'); // 项目集存在且正常访问
+r($program2) && p() && e('0');                   // 项目集不存在
+r($program3) && p() && e('1');                   // 项目集存在，但不在可以查看的项目集列表
+r($program4) && p() && e('2');                   // 项目集存在，且在可以查看的项目集列表
+r($program5) && p() && e('2');                   // 项目集不存在，且有可以查看的项目集列表

From 60fd9bcfa45e61213be66584a0cf5661c95165c1 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 10:21:53 +0800
Subject: [PATCH 42/59] * Add test case.

---
 test/class/program.class.php            | 15 +++++++++++
 test/model/program/buildoperatemenu.php | 33 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 test/model/program/buildoperatemenu.php

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 3078f1ed6a..08a42f30e5 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -387,4 +387,19 @@ class programTest
     {
         return $this->program->saveState($programID, $programs);
     }
+
+    /**
+     * Test build operate menu.
+     *
+     * @param  int    $programID
+     * @access public
+     * @return void
+     */
+    public function buildOperateMenuTest($programID = 0)
+    {
+        $program = $this->program->getByID($programID);
+        if(empty($program)) return '0';
+
+        return $this->program->buildOperateMenu($program);
+    }
 }
diff --git a/test/model/program/buildoperatemenu.php b/test/model/program/buildoperatemenu.php
new file mode 100644
index 0000000000..a7fcc437cb
--- /dev/null
+++ b/test/model/program/buildoperatemenu.php
@@ -0,0 +1,33 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+
+$program = zdTable('project');
+$program->id->range('1,2');
+$program->name->range('父项目集1,父项目集2');
+$program->type->range('program');
+$program->budget->range('900000,899900');
+$program->path->range('1,2')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(2);
+
+su('admin');
+/**
+
+title=测试 programModel::saveState();
+cid=1
+pid=1
+
+项目集不存在 >> 0
+项目集存在   >> div
+
+*/
+
+$programTester = new programTest();
+$menus1        = $programTester->buildOperateMenuTest(0);
+$menus2        = $programTester->buildOperateMenuTest(1);
+
+r($menus1) && p() && e('0');                 // 项目集不存在
+r(substr($menus2, 1, 3)) && p() && e('div'); // 项目集存在

From 09e6d2eefd6e6628b1994f6bebb1be71eb10de7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Fri, 6 Jan 2023 10:32:59 +0800
Subject: [PATCH 43/59] * Add case of program model.

---
 test/class/program.class.php           | 16 +++++++++
 test/model/program/getlistbysearch.php | 49 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 test/model/program/getlistbysearch.php

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 3078f1ed6a..bc3d83a403 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -15,6 +15,22 @@ class programTest
         $this->program = $tester->loadModel('program');
     }
 
+    /**
+     * Get list by search.
+     *
+     * @param  string $orderBy
+     * @param  int    $queryID
+     * @param  string $sql
+     * @access public
+     * @return array
+     */
+    public function getListBySearchTest($orderBy = 'id_asc', $queryID = 0, $sql = '')
+    {
+        if(!empty($sql)) $_SESSION['programQuery'] = $sql;
+
+        return $this->program->getListBySearch($orderBy, $queryID);
+    }
+
     /**
      * Get pairs.
      *
diff --git a/test/model/program/getlistbysearch.php b/test/model/program/getlistbysearch.php
new file mode 100644
index 0000000000..a5e03c3ea9
--- /dev/null
+++ b/test/model/program/getlistbysearch.php
@@ -0,0 +1,49 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+zdTable('user')->gen(5);
+su('admin');
+
+$program = zdTable('project');
+$program->id->range('1-20');
+$program->name->range('1-20')->prefix('项目集');
+$program->type->range('program');
+$program->path->range('1-20')->prefix(',')->postfix(',');
+$program->grade->range('1');
+$program->status->range('wait,doing,suspended,closed');
+$program->openedBy->range('admin,user1');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(20);
+
+$query = zdTable('userquery');
+$query->id->range('1');
+$query->account->range('admin');
+$query->module->range('program');
+$query->title->range('搜索条件1');
+$query->form->range('`a:41:{s:9:"fieldname";s:0:"";s:11:"fieldstatus";s:0:"";s:9:"fielddesc";s:0:"";s:7:"fieldPM";s:0:"";s:15:"fieldopenedDate";s:0:"";s:10:"fieldbegin";s:0:"";s:8:"fieldend";s:0:"";s:13:"fieldopenedBy";s:0:"";s:19:"fieldlastEditedDate";s:0:"";s:14:"fieldrealBegan";s:0:"";s:12:"fieldrealEnd";s:0:"";s:15:"fieldclosedDate";s:0:"";s:6:"andOr1";s:3:"AND";s:6:"field1";s:4:"name";s:9:"operator1";s:7:"include";s:6:"value1";s:9:"项目集";s:6:"andOr2";s:3:"and";s:6:"field2";s:6:"status";s:9:"operator2";s:1:"=";s:6:"value2";s:0:"";s:6:"andOr3";s:3:"and";s:6:"field3";s:4:"desc";s:9:"operator3";s:7:"include";s:6:"value3";s:0:"";s:10:"groupAndOr";s:3:"and";s:6:"andOr4";s:3:"AND";s:6:"field4";s:6:"status";s:9:"operator4";s:1:"=";s:6:"value4";s:4:"wait";s:6:"andOr5";s:3:"and";s:6:"field5";s:10:"openedDate";s:9:"operator5";s:1:"=";s:6:"value5";s:0:"";s:6:"andOr6";s:3:"and";s:6:"field6";s:5:"begin";s:9:"operator6";s:1:"=";s:6:"value6";s:0:"";s:6:"module";s:7:"program";s:9:"actionURL";s:56:"/program-browse-bySearch-order_asc-0-10-1-myQueryID.html";s:10:"groupItems";s:1:"3";s:8:"formType";s:4:"lite";}`');
+$query->sql->range("`(( 1   AND `name`  LIKE '%项目集%' ) AND ( 1  AND `status` = 'wait'  ))`");
+$query->gen(1);
+
+/**
+
+title=测试 programModel::getListBySearch();
+cid=1
+pid=1
+
+按照id倒序查看，所有名称包含项目集并且未开始的第一个项目集 >> 项目集17
+按照id正序查看，所有名称包含项目集并且进行中的第一个项目集 >> 项目集1
+按照id正序查看，符合搜索条件id=1，的第一个项目集 >> 项目集1
+
+*/
+
+global $tester;
+$programTester = new programTest();
+
+$sql1 = "(( 1   AND `name`  LIKE '%项目集%' ) AND ( 1  AND `status` = 'wait'  ))";
+$sql2 = "(( 1   AND `name`  LIKE '%项目集%' ) AND ( 1  AND `status` = 'doing'  ))";
+
+r($programTester->getListBySearchTest('id_desc', 0, $sql)) && p('17:name') && e('项目集17'); // 按照id倒序查看，所有名称包含项目集并且未开始的第一个项目集
+r($programTester->getListBySearchTest('id_asc', 0, $sql))  && p('1:name')  && e('项目集1');  // 按照id正序查看，所有名称包含项目集并且进行中的第一个项目集
+r($programTester->getListBySearchTest('id_asc', 1))        && p('1:name')  && e('项目集1');  // 按照id正序查看，符合搜索条件id=1，的第一个项目集

From 5701d269594f3f1ebf5aa8d3cac0d4598c109118 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 10:38:13 +0800
Subject: [PATCH 44/59] * Add test case.

---
 test/class/program.class.php            | 18 ++++++++++++++
 test/model/program/buildoperatemenu.php |  2 +-
 test/model/program/setmenu.php          | 32 +++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 test/model/program/setmenu.php

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 08a42f30e5..4e2d23983b 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -402,4 +402,22 @@ class programTest
 
         return $this->program->buildOperateMenu($program);
     }
+
+    /**
+     * Test set menu.
+     *
+     * @param  int    $programID
+     * @access public
+     * @return void
+     */
+    public function setMenuTest($programID = 0)
+    {
+        $program = $this->program->getByID($programID);
+        if(empty($program)) return '0';
+
+        $this->program->setMenu($programID);
+
+        global $lang;
+        return strip_tags($lang->switcherMenu);
+    }
 }
diff --git a/test/model/program/buildoperatemenu.php b/test/model/program/buildoperatemenu.php
index a7fcc437cb..687b260919 100644
--- a/test/model/program/buildoperatemenu.php
+++ b/test/model/program/buildoperatemenu.php
@@ -16,7 +16,7 @@ $program->gen(2);
 su('admin');
 /**
 
-title=测试 programModel::saveState();
+title=测试 programModel::buildOperateMenu();
 cid=1
 pid=1
 
diff --git a/test/model/program/setmenu.php b/test/model/program/setmenu.php
new file mode 100644
index 0000000000..af0757ba5e
--- /dev/null
+++ b/test/model/program/setmenu.php
@@ -0,0 +1,32 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+
+$program = zdTable('project');
+$program->id->range('1,2');
+$program->name->range('项目集1,项目集2');
+$program->type->range('program');
+$program->budget->range('900000,899900');
+$program->path->range('1,2')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(2);
+
+su('admin');
+
+/**
+
+title=测试 programModel::setMenu();
+cid=1
+pid=1
+
+项目集存在的情况   >> 项目集1
+项目集不存在的情况 >> 0
+
+*/
+
+$programTester = new programTest();
+
+r($programTester->setMenuTest(1)) && p() && e('项目集1'); // 项目集存在的情况
+r($programTester->setMenuTest(3)) && p() && e('0');       // 项目集不存在的情况

From 678cb12e20924ef9e04d252c6e904fc374efff80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= <tianshujie0123@163.com>
Date: Fri, 6 Jan 2023 10:44:25 +0800
Subject: [PATCH 45/59] * Add case for program model.

---
 test/class/program.class.php       | 12 +++++++++++
 test/model/program/getswitcher.php | 33 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 test/model/program/getswitcher.php

diff --git a/test/class/program.class.php b/test/class/program.class.php
index adc5d55dfa..2aa0923e60 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -15,6 +15,18 @@ class programTest
         $this->program = $tester->loadModel('program');
     }
 
+    /**
+     * Get switcher.
+     *
+     * @param  int   $programID
+     * @access public
+     * @return string
+     */
+    public function getSwitcherTest($programID = 0)
+    {
+        return $this->program->getSwitcher($programID);
+    }
+
     /**
      * Get list by search.
      *
diff --git a/test/model/program/getswitcher.php b/test/model/program/getswitcher.php
new file mode 100644
index 0000000000..73ec7ac6dd
--- /dev/null
+++ b/test/model/program/getswitcher.php
@@ -0,0 +1,33 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+
+$program = zdTable('project');
+$program->id->range('1,2');
+$program->name->range('父项目集1,父项目集2');
+$program->type->range('program');
+$program->budget->range('900000,899900');
+$program->path->range('1,2')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(2);
+
+su('admin');
+/**
+
+title=测试 programModel::saveState();
+cid=1
+pid=1
+
+查看传入空项目集返回的下拉菜单 >> 所有项目集
+查看传入id=1的项目集返回的下拉菜单 >> 父项目集1
+
+*/
+
+$programTester = new programTest();
+$switcher1     = $programTester->getSwitcherTest(0);
+$switcher2     = $programTester->getSwitcherTest(1);
+
+r(strip_tags($switcher1)) && p() && e('所有项目集'); // 查看传入空项目集返回的下拉菜单
+r(strip_tags($switcher2)) && p() && e('父项目集1');  // 查看传入id=1的项目集返回的下拉菜单

From d1072d16a4c37d5828b13c27463df5b4c42ffe1e Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 10:46:37 +0800
Subject: [PATCH 46/59] * Add test case.

---
 test/model/program/gettopbypath.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 test/model/program/gettopbypath.php

diff --git a/test/model/program/gettopbypath.php b/test/model/program/gettopbypath.php
new file mode 100644
index 0000000000..56e6e4b382
--- /dev/null
+++ b/test/model/program/gettopbypath.php
@@ -0,0 +1,20 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+
+/**
+
+title=测试 programModel::getTopByPath();
+cid=1
+pid=1
+
+获取顶级项目集的顶级id     >> 1
+获取子项目集的顶级父项目集 >> 2
+
+*/
+
+global $tester;
+$tester->loadModel('program');
+
+r($tester->program->getTopByPath(',1,'))   && p() && e('1'); // 获取顶级项目集的顶级id
+r($tester->program->getTopByPath(',2,3,')) && p() && e('2'); // 获取子项目集的顶级父项目集

From 08167f31935e55c9376822a8eb90495253108646 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 10:56:08 +0800
Subject: [PATCH 47/59] * Add test case.

---
 test/model/program/getlink.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 test/model/program/getlink.php

diff --git a/test/model/program/getlink.php b/test/model/program/getlink.php
new file mode 100644
index 0000000000..5d9fcb3500
--- /dev/null
+++ b/test/model/program/getlink.php
@@ -0,0 +1,26 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+
+/**
+
+title=测试 programModel::getLink();
+cid=1
+pid=1
+
+项目集页面跳转项目集项目列表 >> project
+非项目集页面跳转项目集列表   >> all
+
+*/
+
+global $tester;
+$tester->loadModel('program');
+$link1 = $tester->program->getLink('program', 'project', 1);
+$result = '';
+if(strpos($link1, 'project')) $result = 'project';
+
+r($result) && p() && e('project'); // 项目集页面跳转项目集项目列表
+
+$link2 = $tester->program->getLink('program', 'project', 1, '', 'product');
+if(strpos($link2, 'all')) $result = 'all';
+r($result) && p() && e('all'); // 非项目集页面跳转项目集列表

From 65f3c96c60bbeddc875859c32f0847064953a02f Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 10:57:31 +0800
Subject: [PATCH 48/59] * Adjust code.

---
 test/class/program.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/class/program.class.php b/test/class/program.class.php
index 189ed9f88c..2871829ce6 100644
--- a/test/class/program.class.php
+++ b/test/class/program.class.php
@@ -421,7 +421,7 @@ class programTest
      *
      * @param  int    $programID
      * @access public
-     * @return void
+     * @return string
      */
     public function buildOperateMenuTest($programID = 0)
     {
@@ -436,7 +436,7 @@ class programTest
      *
      * @param  int    $programID
      * @access public
-     * @return void
+     * @return string
      */
     public function setMenuTest($programID = 0)
     {

From bb439b3c0cdf206d3fa7a5f0601480e59de41752 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 11:01:49 +0800
Subject: [PATCH 49/59] * Adjust code.

---
 test/model/program/getlink.php         | 1 -
 test/model/program/getlistbysearch.php | 2 +-
 test/model/program/savestate.php       | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/model/program/getlink.php b/test/model/program/getlink.php
index 5d9fcb3500..24b4eba530 100644
--- a/test/model/program/getlink.php
+++ b/test/model/program/getlink.php
@@ -18,7 +18,6 @@ $tester->loadModel('program');
 $link1 = $tester->program->getLink('program', 'project', 1);
 $result = '';
 if(strpos($link1, 'project')) $result = 'project';
-
 r($result) && p() && e('project'); // 项目集页面跳转项目集项目列表
 
 $link2 = $tester->program->getLink('program', 'project', 1, '', 'product');
diff --git a/test/model/program/getlistbysearch.php b/test/model/program/getlistbysearch.php
index a5e03c3ea9..8afe79a575 100644
--- a/test/model/program/getlistbysearch.php
+++ b/test/model/program/getlistbysearch.php
@@ -34,7 +34,7 @@ pid=1
 
 按照id倒序查看，所有名称包含项目集并且未开始的第一个项目集 >> 项目集17
 按照id正序查看，所有名称包含项目集并且进行中的第一个项目集 >> 项目集1
-按照id正序查看，符合搜索条件id=1，的第一个项目集 >> 项目集1
+按照id正序查看，符合搜索条件id=1，的第一个项目集           >> 项目集1
 
 */
 
diff --git a/test/model/program/savestate.php b/test/model/program/savestate.php
index b4aa6666df..37528417a7 100644
--- a/test/model/program/savestate.php
+++ b/test/model/program/savestate.php
@@ -38,7 +38,7 @@ $program4 = $programTester->saveStateTest(3, array(2 => ''));
 $program5 = $programTester->saveStateTest(0, array(2 => ''));
 
 r(substr($program1, 1, 4)) && p() && e('html'); // 项目集存在且正常访问
-r($program2) && p() && e('0');                   // 项目集不存在
-r($program3) && p() && e('1');                   // 项目集存在，但不在可以查看的项目集列表
-r($program4) && p() && e('2');                   // 项目集存在，且在可以查看的项目集列表
-r($program5) && p() && e('2');                   // 项目集不存在，且有可以查看的项目集列表
+r($program2) && p() && e('0');                  // 项目集不存在
+r($program3) && p() && e('1');                  // 项目集存在，但不在可以查看的项目集列表
+r($program4) && p() && e('2');                  // 项目集存在，且在可以查看的项目集列表
+r($program5) && p() && e('2');                  // 项目集不存在，且有可以查看的项目集列表

From 5ccabca585c38356b590deeefcd95c60743b1a41 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 6 Jan 2023 03:07:11 +0000
Subject: [PATCH 50/59]  * Finish task #82068.

---
 module/datatable/control.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/module/datatable/control.php b/module/datatable/control.php
index 5ff84da3f2..bd8a7f53dc 100644
--- a/module/datatable/control.php
+++ b/module/datatable/control.php
@@ -90,6 +90,9 @@ class datatable extends control
         }
 
         $cols = $this->datatable->getFieldList($module);
+
+        if($module == 'story' && $extra != 'requirement') unset($cols['SRS']);
+
         if($extra == 'requirement')
         {
             unset($cols['plan']);
@@ -97,6 +100,8 @@ class datatable extends control
             unset($cols['taskCount']);
             unset($cols['bugCount']);
             unset($cols['caseCount']);
+            unset($cols['URS']);
+
             $cols['title']['title'] = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->title);
         }
 

From cdbdc1818733951caf61c3e80fbafa512b13fbd2 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 11:12:42 +0800
Subject: [PATCH 51/59] * Update result check.

---
 test/model/program/getstakeholders.php    | 4 ++--
 test/model/program/getteammemberpairs.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/model/program/getstakeholders.php b/test/model/program/getstakeholders.php
index 2a769ee78c..19c11e1b2d 100755
--- a/test/model/program/getstakeholders.php
+++ b/test/model/program/getstakeholders.php
@@ -31,7 +31,7 @@ pid=1
 
 获取干系人数量                     >> 2
 获取干系人数量                     >> 1
-id倒序排，获取第一个干系人真实姓名 >> 测试2
+id倒序排，获取第一个干系人真实姓名 >> 用户2
 id正序排，获取第一个干系人真实姓名 >> 用户1
 
 */
@@ -42,5 +42,5 @@ $stakeholders2 = $programTester->getStakeholdersTest(2, 'id_asc');
 
 r(count($stakeholders1)) && p()             && e('2');     // 获取干系人数量
 r(count($stakeholders2)) && p()             && e('1');     // 获取干系人数量
-r($stakeholders1)        && p('0:realname') && e('测试2'); // id倒序排，获取第一个干系人真实姓名
+r($stakeholders1)        && p('0:realname') && e('用户2'); // id倒序排，获取第一个干系人真实姓名
 r($stakeholders2)        && p('0:realname') && e('用户1'); // id正序排，获取第一个干系人真实姓名
diff --git a/test/model/program/getteammemberpairs.php b/test/model/program/getteammemberpairs.php
index 020ec104e8..8aca9d2604 100755
--- a/test/model/program/getteammemberpairs.php
+++ b/test/model/program/getteammemberpairs.php
@@ -39,7 +39,7 @@ pid=1
 获取项目集1下所有团队成员数量     >> 5
 获取项目集2下所有团队成员数量     >> 2
 获取项目集1下所有团队成员真实姓名 >> A:admin
-获取项目集2下所有团队成员真实姓名 >> U:测试2
+获取项目集2下所有团队成员真实姓名 >> U:用户2
 
 */
 
@@ -50,4 +50,4 @@ $teams2 = $programTester->getTeamMemberPairsTest(2);
 r(count($teams1)) && p()        && e('5');           // 获取项目集1下所有团队成员数量
 r(count($teams2)) && p()        && e('2');           // 获取项目集2下所有团队成员数量
 r($teams1)        && p('admin') && e('A:admin');     // 获取项目集1下所有团队成员真实姓名
-r($teams2)        && p('user2') && e('U:测试2');     // 获取项目集2下所有团队成员真实姓名
+r($teams2)        && p('user2') && e('U:用户2');     // 获取项目集2下所有团队成员真实姓名

From 94d6f915630217750029dbc487eaf4220b71b501 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 6 Jan 2023 11:45:35 +0800
Subject: [PATCH 52/59] * Add test data.

---
 test/model/program/getprojectlist.php | 16 +++++++++++++++-
 test/model/program/processnode.php    | 21 +++++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/test/model/program/getprojectlist.php b/test/model/program/getprojectlist.php
index eda706a9e1..7d4fac3049 100755
--- a/test/model/program/getprojectlist.php
+++ b/test/model/program/getprojectlist.php
@@ -2,7 +2,6 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
-su('admin');
 
 $program = zdTable('project');
 $program->id->range('1-5');
@@ -16,6 +15,21 @@ $program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD
 $program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
 $program->gen(5);
 
+$team = zdTable('team');
+$team->id->range('1-5');
+$team->root->range('3-5');
+$team->type->range('project');
+$team->account->range('admin');
+$team->account->setFields(array(
+    array('field' => 'account1', 'range' => 'admin,user{4}'),
+    array('field' => 'account2', 'range' => '[],1-4'),
+));
+$team->gen(5);
+
+zdTable('user')->gen(5);
+
+su('admin');
+
 /**
 
 title=测试 programModel::getProjectList();
diff --git a/test/model/program/processnode.php b/test/model/program/processnode.php
index 8e60d5b55c..ddcae67593 100755
--- a/test/model/program/processnode.php
+++ b/test/model/program/processnode.php
@@ -1,7 +1,19 @@
 #!/usr/bin/env php
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
-include dirname(dirname(dirname(__FILE__))) . '/class/program.class.php';
+su('admin');
+
+$program = zdTable('project');
+$program->id->range('1-5');
+$program->name->range('项目集1,项目集2,项目1,项目2,项目3');
+$program->type->range('program{2},project{3}');
+$program->status->range('doing{3},closed,doing');
+$program->parent->range('0,0,1,1,2');
+$program->grade->range('1{2},2{3}');
+$program->path->range('1,2,`1,3`,`1,4`,`2,5`')->prefix(',')->postfix(',');
+$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$program->gen(5);
 
 /**
 
@@ -9,10 +21,11 @@ title=测试 programModel::processNode();
 cid=1
 pid=1
 
- >> 1
+更新项目集层级和路径 >> 1
 
 */
 
-$program = new Program('admin');
+global $tester;
+$tester->loadModel('program');
 
-r($program->processNode(1, 0, 1, 1)) && p() && e('1');
\ No newline at end of file
+r($tester->program->processNode(1, 2, 1, 1)) && p() && e('1'); // 更新项目集层级和路径

From 913a8d84703bff870dcd4c1952de7ae1a6b88a08 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 6 Jan 2023 06:04:38 +0000
Subject: [PATCH 53/59] * Fix bug #31537.

---
 module/project/view/create.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 40e8406e74..724dee301e 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -222,9 +222,9 @@
                 </div>
               </div>
             </div>
-            <div class="input-group addProduct hidden <?php if($programID) echo 'required';?>">
+            <div class="input-group addProduct hidden">
               <?php echo html::input('productName', '', "class='form-control'");?>
-              <span class='input-group-addon'><?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?></span>
+              <span class='input-group-addon required'><?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?></span>
             </div>
           </td>
         </tr>

From 2428521b8e5a5a3fc6c7961f9856f9d737fe168b Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 6 Jan 2023 06:08:31 +0000
Subject: [PATCH 54/59] * Modify the login unit testcase.

---
 test/model/user/login.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/model/user/login.php b/test/model/user/login.php
index b022824c64..f2128676b1 100755
--- a/test/model/user/login.php
+++ b/test/model/user/login.php
@@ -4,6 +4,9 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+$user = zdTable('user');
+$user->gen(50);
+
 /**
 
 title=测试 userModel->login();
@@ -11,7 +14,7 @@ cid=1
 pid=1
 
 使用admin登录，返回此用户为超级管理员 >> 1
-使用Admin登录，返回权限列表的数量 >> 3
+使用user3登录，返回权限列表的数量 >> 6
 使用空账号登录，返回权限列表数量为0 >> 0
 
 */
@@ -23,11 +26,16 @@ $admin->id      = 1;
 $admin->account = 'admin';
 $admin          = $userClass->loginTest($admin);
 
+$normalAccount = new stdclass();
+$normalAccount->id      = 4;
+$normalAccount->account = 'user3';
+$normalAccount          = $userClass->loginTest($normalAccount);
+
 $emptyAccount = new stdclass();
 $emptyAccount->id      = 0;
 $emptyAccount->account = '';
 $emptyAccount          = $userClass->loginTest($emptyAccount);
 
-r($admin)                       && p('admin') && e('1'); //使用admin登录，返回此用户为超级管理员
-r(count($admin->rights))        && p()        && e('3'); //使用Admin登录，返回权限列表的数量
-r(count($emptyAccount->group))  && p()        && e('0'); //使用空账号登录，返回权限列表数量为0
\ No newline at end of file
+r($admin)                        && p('admin') && e('1'); //使用admin登录，返回此用户为超级管理员
+r(count($normalAccount->rights)) && p()        && e('6'); //使用admin登录，返回权限列表的数量
+r(count($emptyAccount->group))   && p()        && e('0'); //使用空账号登录，返回权限列表数量为0

From e1dac9ae2db5064f61045aa287b790d4db57223f Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 6 Jan 2023 06:32:20 +0000
Subject: [PATCH 55/59] * Modify the getgroups unit testcase.

---
 test/model/user/getgroups.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/model/user/getgroups.php b/test/model/user/getgroups.php
index 547d7542e4..6eae0fe23a 100755
--- a/test/model/user/getgroups.php
+++ b/test/model/user/getgroups.php
@@ -4,6 +4,12 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+$user = zdTable('user');
+$user->gen(50);
+
+$userGroup = zdTable('usergroup');
+$userGroup->gen(500);
+
 /**
 
 title=测试 userModel::getGroups();
@@ -19,4 +25,4 @@ $user = new userTest();
 
 r($user->getGroupsTest('admin'))        && p() && e('0'); // 获取admin所在的分组,为空
 r(count($user->getGroupsTest('test2'))) && p() && e('1'); // 通过test2所在的分组数量，1个
-r($user->getGroupsTest(''))             && p() && e('0'); // 传空用户名，返回空
\ No newline at end of file
+r($user->getGroupsTest(''))             && p() && e('0'); // 传空用户名，返回空

From 309ee56b0350df5ed368f03a06d5815a45de478b Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 6 Jan 2023 06:36:13 +0000
Subject: [PATCH 56/59] * Fix bug #31537.

---
 module/story/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/config.php b/module/story/config.php
index 72e8a36ee3..9dd4527e86 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -254,5 +254,5 @@ $config->story->datatable->fieldList['caseCount']['name']     = $lang->story->ca
 
 $config->story->datatable->fieldList['actions']['title']    = 'actions';
 $config->story->datatable->fieldList['actions']['fixed']    = 'right';
-$config->story->datatable->fieldList['actions']['width']    = $app->tab == 'project' ? '230' : '210';
+$config->story->datatable->fieldList['actions']['width']    = $app->tab == 'project' ? '250' : '230';
 $config->story->datatable->fieldList['actions']['required'] = 'yes';

From 44cbe6c451d66d31d67ebd13c83b98900ca60ee6 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 6 Jan 2023 06:47:27 +0000
Subject: [PATCH 57/59] * Modify the getgroupsbyvisions unit testcase.

---
 test/model/user/getgroupsbyvisions.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/model/user/getgroupsbyvisions.php b/test/model/user/getgroupsbyvisions.php
index 553f85e34b..e3f8e9c30e 100755
--- a/test/model/user/getgroupsbyvisions.php
+++ b/test/model/user/getgroupsbyvisions.php
@@ -10,15 +10,15 @@ title=测试 userModel::getGroupsByVisions();
 cid=1
 pid=1
 
-获取系统中所有研发界面分组的数量 >> 14
+获取系统中所有研发界面分组的数量 >> 13
 获取系统中所有迅捷界面分组的数量 >> 3
 传空Visions，返回空数组 >> 0
-获取系统中所有用户分组的数量 >> 17
+获取系统中所有用户分组的数量 >> 16
 
 */
 $user = new userTest();
 
-r(count($user->getGroupsByVisionsTest(array('rnd'))))         && p() && e('14'); // 获取系统中所有研发界面分组的数量
+r(count($user->getGroupsByVisionsTest(array('rnd'))))         && p() && e('13'); // 获取系统中所有研发界面分组的数量
 r(count($user->getGroupsByVisionsTest(array('lite'))))        && p() && e('3');  // 获取系统中所有迅捷界面分组的数量
 r($user->getGroupsByVisionsTest(array()))                     && p() && e('0');  // 传空Visions，返回空数组
-r(count($user->getGroupsByVisionsTest(array('rnd','lite'))))  && p() && e('17'); // 获取系统中所有用户分组的数量
\ No newline at end of file
+r(count($user->getGroupsByVisionsTest(array('rnd','lite'))))  && p() && e('16'); // 获取系统中所有用户分组的数量

From 2014040461885c852c26819064f488322cc8039a Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 6 Jan 2023 06:58:49 +0000
Subject: [PATCH 58/59] * Adjust code

---
 module/user/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/user/model.php b/module/user/model.php
index 6ac615e7a0..c8b983f546 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -485,7 +485,7 @@ class userModel extends model
                 }
 
                 $accounts[$i]     = $data[$i]->account;
-                $prev['company']  = $data[$i]->company;
+                if($users->userType == 'outside') $prev['company']  = $data[$i]->company;
                 $prev['dept']     = $data[$i]->dept;
                 $prev['role']     = $data[$i]->role;
                 $prev['group']    = $data[$i]->group;

From f455ff5a89c1e7a81c5b3d020996c655aa1de45a Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 6 Jan 2023 07:22:45 +0000
Subject: [PATCH 59/59]  * Finish task #82058.

---
 module/bug/model.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index c4ebe96f61..b1bc91512f 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1528,16 +1528,24 @@ class bugModel extends model
      */
     public function getBugs2Link($bugID, $browseType = 'bySearch', $queryID = 0, $pager = null, $excludeBugs = '')
     {
+        $bug       = $this->getById($bugID);
+        $bugIDList = $bug->id . ',' . $bug->linkBug . ',' . $excludeBugs;
+
         if($browseType == 'bySearch')
         {
-            $bug       = $this->getById($bugID);
-            $bugIDList = $bug->id . ',' . $bug->linkBug . ',' . $excludeBugs;
-            $bugs2Link = $this->getBySearch($bug->product, 'all', $queryID, 'id', $bugIDList, $pager);
-            return $bugs2Link;
+            return $this->getBySearch($bug->product, 'all', $queryID, 'id', $bugIDList, $pager);
         }
         else
         {
-            return array();
+            return $this->dao->select('*')->from(TABLE_BUG)
+                ->where('deleted')->eq('0')
+                ->andWhere('id')->notin($bugIDList)
+                ->andWhere('product')->eq($bug->product)
+                ->beginIF($bug->project)->andWhere('project')->eq($bug->project)->fi()
+                ->beginIF($bug->execution)->andWhere('execution')->eq($bug->execution)->fi()
+                ->orderBy('id desc')
+                ->page($pager)
+                ->fetchAll();
         }
     }