From 9e67c8f3d7c6994d92f3ef2cc5b8b9d882a1a068 Mon Sep 17 00:00:00 2001
From: jiaoyukun <“215509543@qq.com”>
Date: Wed, 22 Apr 2026 11:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E7=9D=BF=E7=A7=AF=E5=88=86=E5=85=BC?=
=?UTF-8?q?=E5=AE=B9=E6=97=A0=E5=9B=A2=E9=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/view/score/employee/add.html | 2 +-
application/admin/view/score/employee/edit.html | 2 +-
application/api/controller/Score.php | 1 +
application/common/model/score/Log.php | 6 +++++-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/application/admin/view/score/employee/add.html b/application/admin/view/score/employee/add.html
index 3579a9d..8414d05 100644
--- a/application/admin/view/score/employee/add.html
+++ b/application/admin/view/score/employee/add.html
@@ -17,7 +17,7 @@
diff --git a/application/admin/view/score/employee/edit.html b/application/admin/view/score/employee/edit.html
index ccd7505..120985a 100644
--- a/application/admin/view/score/employee/edit.html
+++ b/application/admin/view/score/employee/edit.html
@@ -17,7 +17,7 @@
diff --git a/application/api/controller/Score.php b/application/api/controller/Score.php
index 80b4f5c..6973851 100644
--- a/application/api/controller/Score.php
+++ b/application/api/controller/Score.php
@@ -17,6 +17,7 @@ class Score extends Api
*/
protected $model = null;
protected $noNeedRight = ['*'];
+// protected $noNeedLogin = ['*'];
public function _initialize()
{
diff --git a/application/common/model/score/Log.php b/application/common/model/score/Log.php
index b45e5a4..e857515 100644
--- a/application/common/model/score/Log.php
+++ b/application/common/model/score/Log.php
@@ -431,6 +431,9 @@ class Log extends BaseModel
$my_team_score = null;
$my_team_id = null;
+
+// var_dump($user_id);
+
foreach ($employees as $employee){
//统计当前员工积分
$score = self::where("score_employee_id",$employee['id'])
@@ -446,6 +449,7 @@ class Log extends BaseModel
];
$employee_score[$employee['id']] = $employeedata;
if($user_id && $user_id == $employee['user_id']){
+
$my_employee_score = $employeedata;
$my_team_id = $employee['team_id'];
}
@@ -468,7 +472,7 @@ class Log extends BaseModel
}
//自己团队的积分
if($my_team_id){
- $my_team_score = $team_score[$my_team_id];
+ $my_team_score = $team_score[$my_team_id] ?? 0;
}