From fd861ec262b84f44128d5e8d06d28b9447cd8a15 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 21 Oct 2022 08:50:45 +0800
Subject: [PATCH 1/3]  * code for task #72274.

---
 module/user/control.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/user/control.php b/module/user/control.php
index 75a0f5f18b..2936b62c09 100755
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -1043,6 +1043,7 @@ class user extends control
         session_destroy();
         setcookie('za', false);
         setcookie('zp', false);
+        setcookie('tab', false);
 
         if($this->app->getViewType() == 'json') return print(json_encode(array('status' => 'success')));
         $vars = !empty($referer) ? "referer=$referer" : '';

From b5916c9b0e2040c29c7a2da022ec38a533d53301 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Fri, 21 Oct 2022 01:03:34 +0000
Subject: [PATCH 2/3] * Fix bug #28747.

---
 module/project/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index af615515ae..2fe088fcb3 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -931,7 +931,7 @@ class projectModel extends model
      */
     public function getProjectExecutionPairs()
     {
-        return $this->dao->select('project, id')->from(TABLE_PROJECT)->andWhere('multiple')->eq('0')->andWhere('deleted')->eq('0')->fetchPairs();
+        return $this->dao->select('project, id')->from(TABLE_PROJECT)->where('multiple')->eq('0')->andWhere('deleted')->eq('0')->fetchPairs();
     }
 
     /**

From d94620895063de0e3c7fc279ae159bef46500be6 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Fri, 21 Oct 2022 01:07:38 +0000
Subject: [PATCH 3/3] * Fix bug #28756.

---
 module/personnel/control.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/personnel/control.php b/module/personnel/control.php
index 5046609e2a..b201188e71 100644
--- a/module/personnel/control.php
+++ b/module/personnel/control.php
@@ -176,10 +176,10 @@ class personnel extends control
         $copyUsers   = empty($copyID) ? array() : $this->personnel->getWhitelistAccount($copyID, $copyObjectType);
         $appendUsers = array_unique($deptUsers + $copyUsers);
 
-        $objectName = $this->lang->projectCommon . $this->lang->execution->or . $objectName;
-        if($objectType == 'program')           $objectName = $this->lang->program->common;
-        if($objectType == 'product')           $objectName = $this->lang->productCommon;
-        if($objectType == 'project')           $objectName = $this->lang->projectCommon;
+        $objectName = $this->lang->projectCommon . $this->lang->execution->or . $this->lang->execution->common;;
+        if($objectType == 'program') $objectName = $this->lang->program->common;
+        if($objectType == 'product') $objectName = $this->lang->productCommon;
+        if($objectType == 'project') $objectName = $this->lang->projectCommon;
         $this->lang->personnel->selectObjectTips = sprintf($this->lang->personnel->selectObjectTips, $objectName);
 
         if($objectType == 'sprint' and $module == 'execution')