gx

@@ -8,6 +8,8 @@ use App\Http\Logic\Bside\BTemplate\CustomTemplateLogic;
 use App\Http\Requests\Bside\Template\CustomTemplateRequest;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplateLog;
+use App\Models\Template\Template;
+use App\Models\User\User;
 
 /**
  * @remark :自定义模块
@@ -125,7 +127,19 @@ class CustomTemplateController extends BaseController
         ]);
         $this->map['source'] = 9;
         $this->map['is_custom'] = 0;
-        $lists = $bTemplateLog->lists($this->map,$this->page,$this->row);
+        $lists = $bTemplateLog->list($this->map,'id',['id','template_id','operator_id','source','created_at','updated_at']);
+        if(!empty($lists)){
+            $templateModel = new Template();
+            $userModel = new User();
+            foreach ($lists['list'] as $k => $v){
+                if(!empty($v['template_id'])){
+                    $v['template_name'] = $templateModel->read(['id'=>$v['template_id']],['name'])['name'];
+                }
+                $v['operator_name'] = $userModel->getName($v['operator_id']);
+                $lists['list'][$k] = $v;
+            }
+        }
+
         $this->response('success',Code::SUCCESS,$lists);
     }