Accept Merge Request #174: (feature/zy -> develop)

Merge Request: feature: gzt

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/174

application/admin/controller/salary/CustomDetail.php

@@ -82,8 +82,9 @@ class CustomDetail extends Backend
                 $admins = Db::name('admin a')
                     ->join('fa_salary_status ss', 'a.id = fa_salary_status.target_admin_id')
                     ->where('create_status', 1)
+                    ->where('settle_status', 1)
                     ->where('salary_month', '=', $month)
-                    ->where('admin.id', $this->auth->id)
+                    ->where('a.id', $this->auth->id)
                     ->field('a.id,a.nickname,ss.settle_status')->select();
             } else{
                 $admins = Db::name('admin a')