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; }