gx

@@ -69,23 +69,6 @@ class TemplateController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :使用模版
-     * @name   :read
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/27 15:07
-     */
-    public function read(TemplateLogic $templateLogic){
-        $this->request->validate([
-            'template_id' => 'required',
-        ],[
-            'template_id.required' => 'template_id不能为空'
-        ]);
-        $data = $templateLogic->usingTemplates();
-        $this->response('选中模版信息',Code::SUCCESS,$data);
-    }
-
-    /**
      * 保存模板
      * 保存模板
      * @author：dc
      * @author：dc
      * @time 2023/5/10 10:53
      * @time 2023/5/10 10:53

@@ -83,12 +83,19 @@ class TemplateLogic extends  BaseLogic
      */
      */
     public function first($source,$source_id)
     public function first($source,$source_id)
     {
     {
-        return $data = BTemplate::where([
+        $data = BTemplate::where([
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
             'data_source'  =>  $source,
             'data_source'  =>  $source,
             'data_source_id'  =>  $source_id,
             'data_source_id'  =>  $source_id,
             'template_id'   => BSetting::_get($this->user['project_id'])['template_id']
             'template_id'   => BSetting::_get($this->user['project_id'])['template_id']
         ])->first();
         ])->first();
+        if(empty($data)){
+            $data = ATemplate::where([
+                'project_id'=>$this->user['project_id'],
+                'template_id'   => BSetting::_get($this->user['project_id'])['template_id']
+            ])->first();
+        }
+        return $data;
     }
     }
 
 
 
 

@@ -2,6 +2,8 @@
 
 
 namespace App\Models\Template;
 namespace App\Models\Template;
 
 
+use App\Models\Base;
+
 /**
 /**
  * 自定义 界面
  * 自定义 界面
  * @author：dc
  * @author：dc
@@ -9,7 +11,7 @@ namespace App\Models\Template;
  * Class BTemplate
  * Class BTemplate
  * @package App\Models\Template
  * @package App\Models\Template
  */
  */
-class BTemplate extends \App\Models\Base{
+class BTemplate extends Base {
 
 
     protected $table = 'gl_web_template';
     protected $table = 'gl_web_template';