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

@@ -82,6 +82,17 @@ class InitProject extends Command
     }
     }
 
 
     /**
     /**
+     * @remark :保存默认扩展模块
+     * @name   :saveModule
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/28 15:53
+     */
+    public function saveModule(){
+
+    }
+
+    /**
      * @param NoticeLog $log
      * @param NoticeLog $log
      */
      */
     public function retry($log, $remark){
     public function retry($log, $remark){

@@ -8,6 +8,7 @@ use App\Http\Logic\Bside\BTemplate\BTemplateLogic;
 use App\Http\Requests\Bside\Template\TemplateRequest;
 use App\Http\Requests\Bside\Template\TemplateRequest;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\BTemplateMain;
+use App\Models\Template\Setting;
 use App\Models\Template\Template;
 use App\Models\Template\Template;
 
 
 class BTemplateController extends BaseController
 class BTemplateController extends BaseController
@@ -31,6 +32,27 @@ class BTemplateController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取用户模版id
+     * @name   :getUserTemplate
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/28 15:34
+     */
+    public function getTemplate(){
+        $bSettingModel = new Setting();
+        $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
+        if($info === false){
+            $this->fail('请先选择模版');
+        }
+        $templateModel = new BTemplate();
+        $templateInfo = $templateModel->read(['template_id'=>$info['template_id'], 'source'=>BTemplate::SOURCE_HOME, 'source_id'=>0],['updated_at']);
+        if($templateInfo !== false){
+            $info['updated_at'] = $templateInfo['updated_at'];
+        }
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
+    /**
      * @remark :获取当前已选择的模板
      * @remark :获取当前已选择的模板
      * @name   :getModuleTemplate
      * @name   :getModuleTemplate
      * @author :lyh
      * @author :lyh

@@ -322,7 +322,7 @@ class BTemplateLogic extends BaseLogic
      */
      */
     public function handleDefaultString($param){
     public function handleDefaultString($param){
         $param['template_id'] = $param['template_id'] ?? 0;
         $param['template_id'] = $param['template_id'] ?? 0;
-        $param['is_custom'] = $param['is_custom'] = 0;
+        $param['is_custom'] = $param['is_custom'] ?? 0;
         $param['section_list_id'] = $param['section_list_id'] ?? '';
         $param['section_list_id'] = $param['section_list_id'] ?? '';
         $param['is_list'] = $param['is_list'] ?? 0;
         $param['is_list'] = $param['is_list'] ?? 0;
         return $this->success($param);
         return $this->success($param);

@@ -306,6 +306,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/publicTemplateLists', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'publicTemplateLists'])->name('template_publicTemplateLists');
         Route::any('/publicTemplateLists', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'publicTemplateLists'])->name('template_publicTemplateLists');
         //获取选中的主题模版
         //获取选中的主题模版
         Route::any('/getPublicTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getPublicTemplate'])->name('template_getPublicTemplate');
         Route::any('/getPublicTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getPublicTemplate'])->name('template_getPublicTemplate');
+        Route::any('/getTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getTemplate'])->name('template_getTemplate');
         //保存修改后的模版
         //保存修改后的模版
         Route::any('/save', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'save'])->name('template_save');
         Route::any('/save', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'save'])->name('template_save');
         //可视化保存获取数据类型
         //可视化保存获取数据类型