From 1b2f9f68e6314037e4115d9c33fd77a0df265291 Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Thu, 4 Aug 2022 13:46:52 +0800 Subject: [PATCH] * Adjust assetlib caselib approval menu. --- module/caselib/model.php | 4 +++- module/project/model.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/caselib/model.php b/module/caselib/model.php index 011c9e1c01..70e2e2cedb 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -152,17 +152,19 @@ class caselibModel extends model /** * Get library list. * + * @param string $type * @param string $orderBy * @param object $pager * @access public * @return array */ - public function getList($orderBy = 'id_desc', $pager = null) + public function getList($type = 'all', $orderBy = 'id_desc', $pager = null) { return $this->dao->select('*')->from(TABLE_TESTSUITE) ->where('product')->eq(0) ->andWhere('deleted')->eq(0) ->andWhere('type')->eq('library') + ->beginIF($type == 'review')->andWhere("FIND_IN_SET('{$this->app->user->account}', `reviewers`)")->fi() ->orderBy($orderBy) ->page($pager) ->fetchAll('id'); diff --git a/module/project/model.php b/module/project/model.php index 0521a29b04..e5595054e1 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -192,7 +192,7 @@ class projectModel extends model $project = $this->dao->select('*')->from(TABLE_PROJECT) ->where('id')->eq($projectID) - ->beginIF($this->config->system == 'new')->andWhere('`type`')->in($type)->fi() + ->beginIF($this->config->systemMode == 'new')->andWhere('`type`')->in($type)->fi() ->fetch(); if(!$project) return false;