gx

@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Aside\Template;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Template\ReplaceHtmlLogic;
 use App\Http\Logic\Aside\Template\ReplaceHtmlLogic;
+use App\Models\Manage\Manage;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtmlLog;
 use App\Models\Template\TemplateReplaceHtmlLog;
 
 
@@ -63,18 +64,22 @@ class ReplaceHtmlController extends BaseController
      * @method :post
      * @method :post
      * @time   :2024/5/8 10:28
      * @time   :2024/5/8 10:28
      */
      */
-    public function replaceTemplateLog(TemplateReplaceHtml $replaceModel){
+    public function replaceTemplateLog(TemplateReplaceHtml $replaceModel,ReplaceHtmlLogic $logic){
         $lists = $replaceModel->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $replaceModel->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $templateLogModel = new TemplateReplaceHtmlLog();
                 $templateLogModel = new TemplateReplaceHtmlLog();
                 $v['sub'] = $templateLogModel->list(['replace_id'=>$v['id']]);
                 $v['sub'] = $templateLogModel->list(['replace_id'=>$v['id']]);
+                $v['operator_name'] = (new Manage())->getName($v['operator_id']);
+                $v['source_name'] =  $logic->getSourceName($v['source'],$v['is_list'],$v['is_custom']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
+
+
     /**
     /**
      * @remark :还原
      * @remark :还原
      * @name   :reductionHtml
      * @name   :reductionHtml

@@ -240,4 +240,22 @@ class ReplaceHtmlLogic extends BaseLogic
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         return $this->success($data);
         return $this->success($data);
     }
     }
+
+    /**
+     * @remark :根据类型获取名称
+     * @name   :getSourceName
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/10 16:55
+     */
+    public function getSourceName($source,$is_list,$is_custom){
+        $arr = ['source'=>$source,'is_list'=>$is_list,'is_custom'=>$is_custom];
+        $data = $this->sourceTypeInfo();
+        foreach ($data as $k => $v){
+            if($v == $arr){
+                return $this->success($k);
+            }
+        }
+        return $this->success();
+    }
 }
 }