From edc9e1593f5bc3f974a737ddbf588b8ba188ed28 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Wed, 11 Nov 2020 11:42:03 +0800
Subject: [PATCH] * Fix bug.

---
 module/holiday/view/browse.html.php | 2 +-
 module/project/control.php          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/holiday/view/browse.html.php b/module/holiday/view/browse.html.php
index 0ffc37341a..e92716c01f 100644
--- a/module/holiday/view/browse.html.php
+++ b/module/holiday/view/browse.html.php
@@ -36,7 +36,7 @@
     </div>
   </div>
   <div class='main-col main-table'>
-  <?php if($holidays):?>
+  <?php if(!empty($holidays)):?>
     <table class='table text-center'>
       <thead>
         <tr class='text-center'>
diff --git a/module/project/control.php b/module/project/control.php
index bd2a8f31b3..6f0f13e0cc 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2412,7 +2412,7 @@ class project extends control
         $this->view->title         = $this->lang->project->allProject;
         $this->view->position[]    = $this->lang->project->allProject;
 
-        $this->view->projectStats  = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, $pager, , $this->session->PRJ);
+        $this->view->projectStats  = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, $pager, $this->session->PRJ);
         $this->view->products      = array(0 => $this->lang->product->select) + $this->loadModel('product')->getProductsByProjec($this->session->PRJ);
         $this->view->productID     = $productID;
         $this->view->projectID     = $projectID;
@@ -2505,7 +2505,7 @@ class project extends control
                 unset($fields[$key]);
             }
 
-            $projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, null);
+            $projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, null, $this->session->PRJ);
             $users        = $this->loadModel('user')->getPairs('noletter');
             foreach($projectStats as $i => $project)
             {