Merge remote-tracking branch 'origin/master' into akun

@@ -26,6 +26,7 @@ class ATemplateController extends BaseController
      */
     public function lists(ATemplateLogic $aTemplateLogic){
         $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
+        $this->map['project_id'] = 0;
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
@@ -225,4 +226,24 @@ class ATemplateController extends BaseController
         $this->response('success',Code::SUCCESS,$info);
     }
 
+    /**
+     * @remark :私有公共模板
+     * @name   :getProjectPublicTemplate
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/28 16:34
+     */
+    public function getProjectPublicTemplate(ATemplateLogic $aTemplateLogic){
+        $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
+        $this->map['project_id'] = ['!=',0];
+        $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                $v['image_link'] = getImageUrl($v['image']);
+                $lists['list'][$k] = $v;
+            }
+        }
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
 }

@@ -311,6 +311,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/setHeadFooter', [Aside\Template\ATemplateController::class, 'setHeadFooter'])->name('admin.template_setHeadFooter');
         Route::any('/getHeadFooter', [Aside\Template\ATemplateController::class, 'getHeadFooter'])->name('admin.template_getHeadFooter');
         Route::any('/setPublicTemplate', [Aside\Template\ATemplateController::class, 'setPublicTemplate'])->name('admin.template_setPublicTemplate');
+        Route::any('/getProjectPublicTemplate', [Aside\Template\ATemplateController::class, 'getProjectPublicTemplate'])->name('admin.template_getProjectPublicTemplate');
         // 左侧模块
         Route::prefix('module')->group(function () {
             Route::any('/', [Aside\Template\ATemplateModuleController::class, 'lists'])->name('admin.ATemplateModule_lists');