1. 付费留存， 2. 设计人员下拉

app/v1/controller/CommonController.php

@@ -225,7 +225,18 @@ class CommonController extends BaseController
      */
     public function getDesignAuthOptions(Request $request): Response
     {
-        $data = $this->systemUserLogic->field('id as value, username as label')->where('dept_id',11)->select()->toArray();
+        $data = $this->systemUserLogic
+            ->field('sa_system_user.id as "value", sa_system_user.username as label')
+            ->leftJoin('sa_system_user_role', 'sa_system_user_role.user_id = sa_system_user.id')
+            ->leftJoin('sa_system_role', 'sa_system_role.id = sa_system_user_role.role_id')
+            ->whereOr('sa_system_role.code', 'designLeader')
+            ->whereOr('sa_system_role.code', 'design')
+            ->where('sa_system_role.status', 1);
+
+            echo $data->buildSql();
+
+            $data = $data->select()
+            ->toArray();
         return $this->success($data);
     }
 

app/v1/logic/dataReport/AnalyseLogic.php

@@ -604,10 +604,10 @@ class AnalyseLogic extends BaseLogic
         $data = [];
         foreach ($regDateRange as $regDate) {
             $row['reg_date'] = $regDate;
-            $row['reg_pay_num'] = $payDataMap[$regDate]['pay_num'] ?? 0;
+            $row['reg_pay_num'] = $payDataMap[$regDate]['pay_num'] ?? '';
             foreach ($remainRange as $remainNum) {
                 $dimension = $regDate . "|" . ($remainNum - 1);
-                $row['remain_' . $remainNum] = $remainData[$dimension]['remain_num'] ?? 0;
+                $row['remain_' . $remainNum] = $remainData[$dimension]['remain_num'] ?? '';
             }
             $data[] = $row;
         }
@@ -622,13 +622,13 @@ class AnalyseLogic extends BaseLogic
         if ($data) foreach ($data as $item) {
 
             $totalRow['reg_pay_num'] = $totalRow['reg_pay_num'] ?? 0;
-            $totalRow['reg_pay_num'] += $item['reg_pay_num'];
+            $totalRow['reg_pay_num'] = $totalRow['reg_pay_num']? $totalRow['reg_pay_num']+$item['reg_pay_num'] : $item['reg_pay_num'];
 
             foreach ($remainRange as $remainNum) {
                 $key = 'remain_' . $remainNum;
 
                 $totalRow[$key] = $totalRow[$key] ?? 0;
-                $totalRow[$key] += $item[$key];
+                $totalRow[$key] = $totalRow[$key] ? $totalRow[$key] + $item[$key] : $item[$key];
             }
         }
 
@@ -636,9 +636,9 @@ class AnalyseLogic extends BaseLogic
         if ($params['show_type'] == 'rate') {
             if ($data) foreach ($remainRange as $remainNum) {
                 $key = 'remain_' . $remainNum;
-                $totalRow[$key] = ToolLogic::getPercent($totalRow[$key], $totalRow['reg_pay_num']);
+                $totalRow[$key] = $totalRow[$key] ? ToolLogic::getPercent($totalRow[$key], $totalRow['reg_pay_num']) : '';
                 foreach ($data as &$val) {
-                    $val[$key] = ToolLogic::getPercent($val[$key], $val['reg_pay_num']);
+                    $val[$key] = $val[$key] ? ToolLogic::getPercent($val[$key], $val['reg_pay_num']) : '';
                 }
             }
         }

app/v1/logic/tool/ToolLogic.php

@@ -29,6 +29,11 @@ class ToolLogic
 
         $start = new \DateTime($startDate);
         $end = new \DateTime($endDate);
+        // 判断$endDate是否大于当前时间，如果大于，则取当前时间
+        $now = new \DateTime();
+        if ($end > $now) {
+            $end = clone $now;
+        }
         $end->modify('first day of next month'); // Include the end month
 
         $tables = [];

plugin/saiadmin/basic/BaseLogic.php

@@ -526,6 +526,7 @@ class BaseLogic
         // 负责人
         if (!empty($params['auth_id'])) {
             if (is_array($params['auth_id'])) {
+                
                 $whereSql .= " AND auth_id IN(" . implode(',', $params['auth_id']) . ")";
             } else {
                 $whereSql .= " AND auth_id = {$params['auth_id']}";