From 218fd95fe5e2289ed2f142f9f9e846863684ee55 Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Wed, 1 Jul 2020 17:09:27 +0800 Subject: [PATCH] * Fix get repos logic. --- module/repo/model.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/module/repo/model.php b/module/repo/model.php index 907251009e..1505cee72f 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -141,7 +141,11 @@ class repoModel extends model */ public function getList($orderBy = 'id_desc', $pager = null) { - $repos = $this->dao->select('*')->from(TABLE_REPO)->where('deleted')->eq('0')->orderBy($orderBy)->page($pager)->fetchAll('id'); + $repos = $this->dao->select('*')->from(TABLE_REPO) + ->where('deleted')->eq('0') + ->andWhere("CONCAT(',', program, ',')")->like("%,{$this->session->program},%") + ->orderBy($orderBy) + ->page($pager)->fetchAll('id'); foreach($repos as $i => $repo) { @@ -268,7 +272,11 @@ class repoModel extends model */ public function getRepoPairs() { - $repos = $this->dao->select('*')->from(TABLE_REPO)->where('deleted')->eq(0)->fetchAll(); + $repos = $this->dao->select('*')->from(TABLE_REPO) + ->where('deleted')->eq(0) + ->andWhere("CONCAT(',', program, ',')")->like("%,{$this->session->program},%") + ->fetchAll(); + $repoPairs = array(); foreach($repos as $repo) {