From 60fc4f00b9d8657676c2b0739d8c51b838995902 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 3 Aug 2023 16:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/AccountLogController.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/api/controller/AccountLogController.php b/app/api/controller/AccountLogController.php
index b2e90bd12..d7aa49fd3 100755
--- a/app/api/controller/AccountLogController.php
+++ b/app/api/controller/AccountLogController.php
@@ -38,11 +38,18 @@ class AccountLogController extends BaseApiController
     //个人月份统计
     public function year_count()
     {
+        $params=$this->request->param();
         $data = [['month' => date('Y') . '-01'], ['month' => date('Y') . '-02'], ['month' => date('Y') . '-03'], ['month' => date('Y') . '-04'], ['month' => date('Y') . '-05'], ['month' => date('Y') . '-06'], ['month' => date('Y') . '-07'], ['month' => date('Y') . '-08'], ['month' => date('Y') . '-09'], ['month' => date('Y') . '-10'], ['month' => date('Y') . '-11'], ['month' => date('Y') . '-12']];
         $year = date('Y');
+        if(isset($params['user_id']) && $params['user_id'] > 0){
+            $where[] =['user_id','=', $params['user_id']];
+        }else{
+            $where[] = ['user_id', '=', $this->userId];
+        }
         $change_amount_1 = Db::name('user_account_log')
             ->whereYear('create_time', $year)
             ->where('action', 1)
+            ->where($where)
             ->field('DATE_FORMAT(FROM_UNIXTIME(create_time), "%Y-%m") as month, SUM(change_amount) as total')
             ->group('month')
             ->order('month')
@@ -50,6 +57,8 @@ class AccountLogController extends BaseApiController
         $change_amount_2 = Db::name('user_account_log')
             ->whereYear('create_time', $year)
             ->where('action', 2)
+            ->where($where)
+
             ->field('DATE_FORMAT(FROM_UNIXTIME(create_time), "%Y-%m") as month, SUM(change_amount) as total')
             ->group('month')
             ->order('month')