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

@@ -397,6 +397,7 @@ class ProjectController extends BaseController
      */
     public function getManagerList(){
         $hrManagerModel = new ManageHr();
+        $this->map['status'] = $hrManagerModel::STATUS_ONE;
         $lists = $hrManagerModel->list($this->map,'id',['id','manage_id','name','entry_position','is_leader']);
         $this->response('success',Code::SUCCESS,$lists);
     }

@@ -87,4 +87,36 @@ class BTemplateController extends BaseController
         $list = $BTemplateLogic->getModuleType();
         $this->response('success',Code::SUCCESS,$list);
     }
+
+    /**
+     * @remark :公共主题设置公共head
+     * @name   :setHead
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:30
+     */
+    public function setHeadFooter(BTemplateLogic $BTemplateLogic){
+        $this->request->validate([
+            'head'=>'required',
+            'footer'=>'required'
+        ],[
+            'head.required' => 'head不能为空',
+            'footer.required' => 'footer不能为空'
+        ]);
+        $BTemplateLogic->setHeadFooterSave();
+        $this->response('success');
+    }
+
+    /**
+     * @remark :获取公共主题head
+     * @name   :getHead
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:30
+     */
+    public function getHeadFooter(BTemplateLogic $BTemplateLogic){
+        $info = $BTemplateLogic->getHeadFooterList();
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
 }

@@ -14,6 +14,7 @@ use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\Template;
 use Illuminate\Support\Facades\DB;
+use mysql_xdevapi\Exception;
 
 /**
  * @remark :b端模块
@@ -316,6 +317,43 @@ class BTemplateLogic extends BaseLogic
         return $info['values'];
     }
 
+    /**
+     * @remark :设置主题公共head
+     * @name   :setHeadInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:32
+     */
+    public function setHeadFooterSave(){
+        $serviceSettingModel = new ServiceSettingModel();
+        DB::beginTransaction();
+        try {
+            $serviceSettingModel->del(['type'=>2]);
+            $data = [
+                ['type'=>2,'key'=>'head','values'=>$this->param['head'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')],
+                ['type'=>2,'key'=>'footer','values'=>$this->param['footer'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')]
+            ];
+            $serviceSettingModel->insert($data);
+            DB::commit();
+        }catch (Exception $e){
+            DB::rollBack();
+            $this->fail('error');
+        }
+    }
+
+    /**
+     * @remark :获取主题公共head
+     * @name   :getHeadInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 15:33
+     */
+    public function getHeadFooterList(){
+        $serviceSettingModel = new ServiceSettingModel();
+        $list = $serviceSettingModel->list(['type'=>2],'created_at');
+        return $this->success($list);
+    }
+
 
     /**
      * @remark :获取类型

@@ -7,6 +7,7 @@ class ManageHr extends Base
 {
     protected $table = 'gl_manage_hr';
 
+    const STATUS_ONE = 1;
     /**
      * 特殊字段
      * @return string[]

@@ -268,6 +268,8 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/save', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'save'])->name('template_save');
         //可视化保存获取数据类型
         Route::any('/getTypeSetting', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getTypeSetting'])->name('template_getTypeSetting');
+        Route::any('/getHeadFooter', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getHeadFooter'])->name('template_getHeadFooter');
+        Route::any('/setHeadFooter', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'setHeadFooter'])->name('template_setHeadFooter');
         // 模板
         Route::prefix('module')->group(function () {
             //获取所有左侧模版