From 3cc7f354369687169fe8916c2bb2972b3a3b754e Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Mon, 1 Jun 2020 16:25:11 +0800
Subject: [PATCH] * Add program condition.

---
 module/compile/model.php | 1 +
 module/jenkins/model.php | 6 +++++-
 module/job/model.php     | 1 +
 module/repo/model.php    | 9 +++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/module/compile/model.php b/module/compile/model.php
index 947acb8b5a..84598adc07 100644
--- a/module/compile/model.php
+++ b/module/compile/model.php
@@ -40,6 +40,7 @@ class compileModel extends model
             ->leftJoin(TABLE_JENKINS)->alias('t4')->on('t2.jkHost=t4.id')
             ->where('t1.deleted')->eq('0')
             ->andWhere('t1.job')->ne('0')
+            ->andWhere('t1.program')->ne($this->session->program)
             ->beginIF(!empty($jobID))->andWhere('t1.job')->eq($jobID)->fi()
             ->orderBy($orderBy)
             ->page($pager)
diff --git a/module/jenkins/model.php b/module/jenkins/model.php
index d46ecca9d9..589453dab6 100644
--- a/module/jenkins/model.php
+++ b/module/jenkins/model.php
@@ -39,6 +39,7 @@ class jenkinsModel extends model
     {
         return $this->dao->select('*')->from(TABLE_JENKINS)
             ->where('deleted')->eq('0')
+            ->andWhere('program')->eq($this->session->program)
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll('id');
@@ -51,7 +52,10 @@ class jenkinsModel extends model
      */
     public function getPairs()
     {
-        $jenkins = $this->dao->select('id,name')->from(TABLE_JENKINS)->where('deleted')->eq('0')->orderBy('id')->fetchPairs('id', 'name');
+        $jenkins = $this->dao->select('id,name')->from(TABLE_JENKINS)
+            ->where('deleted')->eq('0')
+            ->andWhere('program')->eq($this->session->program)
+            ->orderBy('id')->fetchPairs('id', 'name');
         $jenkins = array('' => '') + $jenkins;
         return $jenkins;
     }
diff --git a/module/job/model.php b/module/job/model.php
index f9515b4b45..d7e01f92df 100644
--- a/module/job/model.php
+++ b/module/job/model.php
@@ -37,6 +37,7 @@ class jobModel extends model
             ->leftJoin(TABLE_REPO)->alias('t2')->on('t1.repo=t2.id')
             ->leftJoin(TABLE_JENKINS)->alias('t3')->on('t1.jkHost=t3.id')
             ->where('t1.deleted')->eq('0')
+            ->andWhere('t1.program')->eq($this->session->program)
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll('id');
diff --git a/module/repo/model.php b/module/repo/model.php
index 08f1baf450..a9ced79dfa 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -141,7 +141,9 @@ class repoModel extends model
      */
     public function getList($orderBy = 'id_desc', $pager = null)
     {
-        $repos = $this->dao->select('*')->from(TABLE_REPO)->where('deleted')->eq('0')
+        $repos = $this->dao->select('*')->from(TABLE_REPO)
+            ->where('deleted')->eq('0')
+            ->andWhere('program')->eq($this->session->program)
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll('id');
@@ -271,7 +273,10 @@ 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('program')->eq($this->session->program)
+            ->fetchAll();
         $repoPairs = array();
         foreach($repos as $repo)
         {