Merge branch 'dev' of http://gogs.gisvg.com/yzx/caiping into dev

app/admin/controller/Index.php

@@ -977,7 +977,6 @@ class Index extends BaseController
     public function head()
     {
         $param = get_params();
-        halt($param);
         $where = [];
         if(!empty($param["nickname"])){
             $where = [["a.nickname","like","%".$param["nickname"]."%"]];

app/admin/controller/datastat/Datastat.php

@@ -258,6 +258,7 @@ class Datastat extends BaseController
     {
 
         $unit_id = get_login_admin("unit_name");
+
         //送审单位项目数量排行
         $sent_number_top = Db::query("select sent_review_unit_name
              ,sum(sent_review_amount) as all_sent_amount
@@ -269,13 +270,13 @@ class Datastat extends BaseController
         $authorize_amount_top = Db::query("select review_unit,review_unit_name
             ,sum(authorize_amount) as all_authorize_amount
             from cp_cost_project where entrust_unit=$unit_id and review_unit_name != ''
-            group by review_unit order by all_authorize_amount");
+            group by review_unit,review_unit_name order by all_authorize_amount");
 
         //评审机构送审总额排行
         $sent_review_amount_top = Db::query("select review_unit,review_unit_name
             ,sum(sent_review_amount) as all_sent_amount
             from cp_cost_project where entrust_unit=$unit_id and review_unit_name != ''
-            group by review_unit order by all_sent_amount");
+            group by review_unit,review_unit_name order by all_sent_amount");
 
         $year = (double)$today;
         //2024年送审总额占比分布图
@@ -372,7 +373,7 @@ class Datastat extends BaseController
             ,(sum(authorize_amount)-sum(sent_review_amount))/sum(sent_review_amount) as increaseOrdecrease
             ,count(*) as project_number
             from cp_cost_project where entrust_unit=$unit_id and review_unit_name != ''
-            group by review_unit order by project_number");
+            group by review_unit,review_unit_name order by project_number");
         return $review_poportion;
     }