gx

@@ -12,6 +12,8 @@ namespace App\Http\Controllers\Bside\Template;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\BTemplateLog;
+use App\Models\Template\Template;
+use App\Models\User\User;
 
 
 /**
 /**
  * @remark :用户编辑模版记录
  * @remark :用户编辑模版记录
@@ -32,9 +34,11 @@ class BTemplateLogController extends BaseController
     public function lists(BTemplateLog $bTemplateLog){
     public function lists(BTemplateLog $bTemplateLog){
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){
+            $templateModel = new Template();
+            $userModel = new User();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $v['template_name'] = '';
-                $v['operator_name'] = '';
+                $v['template_name'] = $templateModel->read(['id'=>$v['template_id']],['name'])['name'];
+                $v['operator_name'] = $userModel->read(['id'=>$v['operator_id']],['name'])['name'];
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }