From 36a6d9f4e34367c8eb9e55cae0e7421225530684 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Sun, 26 Sep 2021 14:43:28 +0800
Subject: [PATCH 1/2]  * Finish task #42834.

---
 module/personnel/model.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/module/personnel/model.php b/module/personnel/model.php
index fc8314428c..f53c8daad0 100644
--- a/module/personnel/model.php
+++ b/module/personnel/model.php
@@ -687,17 +687,14 @@ class personnelModel extends model
     /**
      * Determine whether the user exists in the white list of multiple products.
      *
-     * @param  int     $objectID
+     * @param  int     $programID
      * @param  string  $account
      * @access public
      * @return void
      */
-    public function deleteProgramWhitelist($objectID = 0, $account = '')
+    public function deleteProgramWhitelist($programID = 0, $account = '')
     {
-        $program = $this->dao->select('id,program,whitelist')->from(TABLE_PRODUCT)->where('id')->eq($objectID)->fetch();
-        if(empty($program)) return false;
-
-        $programID = $program->program;
+        $program   = $this->loadModel('program')->getByID($programID);
         $products  = $this->dao->select('id')->from(TABLE_PRODUCT)->where('program')->eq($programID)->andWhere('deleted')->eq('0')->fetchPairs('id');
         $whitelist = $this->dao->select('*')->from(TABLE_ACL)->where('objectID')->in($products)->andWhere('account')->eq($account)->andWhere('objectType')->eq('product')->fetch();
 

From 7dfa0963e6f4621d68a675c20876a8c29f36dc62 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Sun, 26 Sep 2021 16:23:20 +0800
Subject: [PATCH 2/2]  * Finish task #42860.

---
 module/story/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 6ab29fba3b..2bb3dc30ae 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2394,8 +2394,8 @@ class storyModel extends model
         /* Get the sql and form status from the query. */
         if($query)
         {
-            $this->session->set('storyQuery', $query->sql, $this->app->tab);
-            $this->session->set('storyForm', $query->form, $this->app->tab);
+            $this->session->set('storyQuery', $query->sql);
+            $this->session->set('storyForm', $query->form);
         }
         if($this->session->storyQuery == false) $this->session->set('storyQuery', ' 1 = 1');