From b42d7e112970a121be252934a550d4a3c07d5089 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 24 Nov 2021 17:30:48 +0800
Subject: [PATCH]  * Fix bug #16639,#16599.

---
 module/personnel/js/addwhitelist.js | 4 ++--
 module/testtask/control.php         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/personnel/js/addwhitelist.js b/module/personnel/js/addwhitelist.js
index 62b8cc95d3..158d99603d 100644
--- a/module/personnel/js/addwhitelist.js
+++ b/module/personnel/js/addwhitelist.js
@@ -60,7 +60,7 @@ function showItem(val)
         var select = this;
         $(this).children('option').each(function()
         {
-            if($(this).html().indexOf(val) != -1)
+            if($(this).html() == val)
             {
                 $(this).css('display', '');
             }
@@ -79,7 +79,7 @@ function hideItem(select, val)
 {
     $(select).children('option').each(function()
     {
-        if($(this).html().indexOf(val) != -1)
+        if($(this).html() == val)
         {
             $(this).css("display", "none");
         }
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 70fd5cd2d3..d6bbe74b92 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1363,7 +1363,7 @@ class testtask extends control
             ->andWhere('`case`')->in($this->post->caseIDList)
             ->exec();
         $this->loadModel('action');
-        foreach($this->post->caseIDList as $caseID) $this->action->create('case', $caseID, 'assigned', '', $taskID);
+        foreach($this->post->caseIDList as $caseID) $this->action->create('case', $caseID, 'assigned', '', $this->post->assignedTo);
         die(js::locate($this->session->caseList, 'parent'));
     }