From 6deba0c2403c97816da6445f4bc194dcea4296eb Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 7 Apr 2022 07:44:39 +0000
Subject: [PATCH] * Fix bug #21103,21176

---
 module/company/control.php           | 1 +
 module/company/view/dynamic.html.php | 1 +
 module/doc/css/objectlibs.css        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/module/company/control.php b/module/company/control.php
index 6971c65e72..55bbbb75c4 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -278,6 +278,7 @@ class company extends control
         $this->loadModel('search')->setSearchParams($this->config->company->dynamic->search);
 
         /* Assign. */
+        $this->view->recTotal     = $recTotal;
         $this->view->browseType   = $browseType;
         $this->view->account      = $account;
         $this->view->accountPairs = $accountPairs;
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 9b580f05be..f8d518eed8 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -22,6 +22,7 @@
     if($period == $browseType)
     {
         $active = 'btn-active-text';
+        $pager->recTotal = $recTotal ? $recTotal : $pager->recTotal;
         $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
     }
     echo html::a(inlink('dynamic', "browseType=$period&param=&recTotal=0&date=&direction=next&userID=$userID&productID=$productID&projectID=$projectID&executionID=$executionID&orderBy=$orderBy"), $label, '', "class='btn btn-link $active' id='{$period}'")
diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css
index 8ced76e32c..71a6036c15 100644
--- a/module/doc/css/objectlibs.css
+++ b/module/doc/css/objectlibs.css
@@ -47,3 +47,4 @@
 .tree-group .tree-actions {display: none; position: absolute; right: 0; top: 0; background-color: #fff; white-space: nowrap;}
 .tree-group:hover > .module-name {width: calc(100% - 20px);}
 .tree-group:hover .tree-actions {display: block}
+.tree li.has-list.open:before {left: 6px;}