From 166fcf585ce5cd7e0cd522660673d667119df3d6 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Wed, 10 Jan 2024 16:04:29 +0800 Subject: [PATCH] * Fix managemembers unit test bug. --- module/project/test/model/managemembers.php | 5 ++--- module/project/test/project.class.php | 18 ++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/module/project/test/model/managemembers.php b/module/project/test/model/managemembers.php index ac3a8807bc..a62f34537c 100755 --- a/module/project/test/model/managemembers.php +++ b/module/project/test/model/managemembers.php @@ -107,9 +107,8 @@ $members2[1]->days = 10; $result4 = $projectClass->manageMembers(4, $members2); r(count($result1)) && p('') && e('3'); // 查看维护团队之后的成员数量 -r(count($result2)) && p('') && e('1'); // 查看维护团队之后的成员数量 r($result1) && p('user1:role') && e('研发'); // 查看维护团队之后的成员角色 -r($result2) && p('days0') && e('可用工日不能大于项目的可用工日『20』'); // 超过项目可用工日的情况 +r($result2) && p() && e('可用工日不能大于项目的可用工日『20』'); // 超过项目可用工日的情况 r($result3) && p('user2:role') && e('测试'); // 查看维护团队之后的成员详情 -r($result4) && p('hours1') && e('可用工时/天不能大于『24』'); // 超过每天可用工时的情况 +r($result4) && p() && e('可用工时/天不能大于『24』'); // 超过每天可用工时的情况 diff --git a/module/project/test/project.class.php b/module/project/test/project.class.php index 59f1200962..e71230d814 100644 --- a/module/project/test/project.class.php +++ b/module/project/test/project.class.php @@ -246,22 +246,16 @@ class Project /** * Test manage members. * - * @param int $projectID - * @param array $members + * @param int $projectID + * @param array $members * @access public - * @return array + * @return array|string */ - public function manageMembers(int $projectID, array $members): array + public function manageMembers(int $projectID, array $members): array|string { $this->project->manageMembers($projectID, $members); - if(dao::isError()) - { - return dao::getError(); - } - else - { - return $this->project->getTeamMembers($projectID); - } + if(dao::isError()) return dao::getError(); + return $this->project->getTeamMembers($projectID); } /**