Merge branch 'develop' of 47.244.231.31:zhl/globalso-v6 into develop

@@ -29,6 +29,7 @@ class TemplateController extends BaseController
         $limit = intval($this->param['limit']??20);
         $limit = intval($this->param['limit']??20);
 
 
 
 
+        // 读取列表
         $data   =   ATemplate::_bAll($limit)->toArray();
         $data   =   ATemplate::_bAll($limit)->toArray();
 
 
 
 
@@ -48,6 +49,7 @@ class TemplateController extends BaseController
         // 保存更新
         // 保存更新
         if($this->isPost()){
         if($this->isPost()){
             $template_id = intval($this->param['template_id']??0);
             $template_id = intval($this->param['template_id']??0);
+            // 是否存在模板
             if($template_id && ATemplate::_bFind($template_id)){
             if($template_id && ATemplate::_bFind($template_id)){
                 BSetting::_save($this->user['project_id'],$template_id);
                 BSetting::_save($this->user['project_id'],$template_id);
             }else{
             }else{
@@ -55,9 +57,9 @@ class TemplateController extends BaseController
             }
             }
         }
         }
 
 
-
+        // 读取我的模板
         $conf = BSetting::_get($this->user['project_id']);
         $conf = BSetting::_get($this->user['project_id']);
-
+        // 读取模板信息
         $data = ATemplate::_bFind($conf['template_id']);
         $data = ATemplate::_bFind($conf['template_id']);
 
 
         return $this->success([
         return $this->success([

@@ -24,7 +24,7 @@ class ManageLog extends Base
 
 
         $log = new self();
         $log = new self();
         $log->title = $menu ? $menu['title'] : '';
         $log->title = $menu ? $menu['title'] : '';
-        $log->manage_id = LoginLogic::manage('id');
+        $log->manage_id = LoginLogic::manage('id') ? : 0;
         $log->route_name = request()->route()->getName();
         $log->route_name = request()->route()->getName();
         $log->action = request()->path();
         $log->action = request()->path();
         $log->method = request()->method();
         $log->method = request()->method();

+<?php
+
+namespace App\Models\Template;
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * 由 A端增删改
+ * 模板
+ * @author：dc
+ * @time 2023/5/9 13:56
+ * Class ATemplate
+ * @package App\Models\Template
+ */
+class ATemplateHtml extends \App\Models\Base{
+
+
+    protected $table = 'gl_aside_template_html';
+
+
+    protected $hidden = ['deleted_at'];
+
+
+    use SoftDeletes;
+
+
+
+
+}