From 2b9e5f4d95fd2f443b3535ac918dc43664eadff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= <zhujinyong@cnezsoft.com>
Date: Fri, 7 Apr 2023 01:21:31 +0000
Subject: [PATCH] Fix bug#33806.

---
 module/block/control.php   | 2 +-
 module/company/control.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 229c6fefc8..028168b088 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -748,7 +748,7 @@ class block extends control
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
 
         $this->view->projects  = $this->loadModel('project')->getPairsByProgram();
-        $this->view->testtasks = $this->dao->select('t1.id,t2.name as productName,t2.shadow,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
+        $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t2.shadow,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
             ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.execution=t4.id')
diff --git a/module/company/control.php b/module/company/control.php
index 9952b5f9df..6a84f863e0 100755
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -74,7 +74,7 @@ class company extends control
         $users = $this->company->getUsers($browseType, $type, $queryID, $deptID, $sort, $pager);
 
         /* Process the sql, get the conditon partion, save it to session. */
-        $this->loadModel('common')->saveQueryCondition($this->company->user->dao->get(), 'user', true);
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'user', true);
 
         /* Remove passwd. */
         foreach($users as $user) unset($user->password);