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

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Template\ATemplateLogic;
 use App\Http\Logic\Aside\Template\ATemplateLogic;
 use App\Http\Requests\Aside\Template\ATemplateRequest;
 use App\Http\Requests\Aside\Template\ATemplateRequest;
+use App\Models\Template\Setting;
 
 
 /**
 /**
  * @remark :A端主题模板管理
  * @remark :A端主题模板管理
@@ -35,6 +36,23 @@ class ATemplateController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取选择的模版
+     * @name   :getTemplateInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/3 17:19
+     */
+    public function getSettingInfo(ATemplateLogic $aTemplateLogic){
+        $this->request->validate([
+            'project_id'=>'required'
+        ],[
+            'project_id.required' => 'project_id不能为空'
+        ]);
+        $info = $aTemplateLogic->getSettingInfo();
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
+    /**
      * @remark :获取数据详情
      * @remark :获取数据详情
      * @name   :read
      * @name   :read
      * @author :lyh
      * @author :lyh

@@ -185,4 +185,21 @@ class ATemplateLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :获取选择的模版
+     * @name   :getSettingInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/3 17:21
+     */
+    public function getSettingInfo(){
+        $data = [];
+        $bSettingModel = new Setting();
+        $info = $bSettingModel->read(['project_id'=>$this->param['project_id']],['template_id']);
+        if($info !== false){
+            $data = $this->model->read(['id'=>$info['template_id']],['id','name']);
+        }
+        return $this->success($data);
+    }
 }
 }

@@ -293,6 +293,7 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::prefix('template')->group(function () {
     Route::prefix('template')->group(function () {
         Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
         Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
         Route::any('/read', [Aside\Template\ATemplateController::class, 'read'])->name('admin.ATemplate_read');
         Route::any('/read', [Aside\Template\ATemplateController::class, 'read'])->name('admin.ATemplate_read');
+        Route::any('/getSettingInfo', [Aside\Template\ATemplateController::class, 'getSettingInfo'])->name('admin.ATemplate_getSettingInfo');
         Route::any('/save', [Aside\Template\ATemplateController::class, 'save'])->name('admin.ATemplate_save');
         Route::any('/save', [Aside\Template\ATemplateController::class, 'save'])->name('admin.ATemplate_save');
         Route::any('/status', [Aside\Template\ATemplateController::class, 'status'])->name('admin.ATemplate_status');
         Route::any('/status', [Aside\Template\ATemplateController::class, 'status'])->name('admin.ATemplate_status');
         Route::any('/del', [Aside\Template\ATemplateController::class, 'del'])->name('admin.ATemplate_del');
         Route::any('/del', [Aside\Template\ATemplateController::class, 'del'])->name('admin.ATemplate_del');