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

@@ -36,7 +36,7 @@ class CustomModuleController extends BaseController
         ProjectServer::useProject($this->param['project_id']);
         ProjectServer::useProject($this->param['project_id']);
         $customModule = new CustomModule();
         $customModule = new CustomModule();
         $this->map['status'] = 0;
         $this->map['status'] = 0;
-        $lists = $customModule->lists($this->map,$this->page,$this->row,$this->order);
+        $lists = $customModule->lists($this->map,$this->page,$this->row,$this->order = ['topping_time','sort','id']);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
@@ -91,4 +91,21 @@ class CustomModuleController extends BaseController
         $logic->customModuleDel();
         $logic->customModuleDel();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :一键指定
+     * @name   :topping
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/21 10:57
+     */
+    public function topping(CustomModuleLogic $logic){
+        $this->request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $logic->setTopping();
+        $this->response('success');
+    }
 }
 }

@@ -19,7 +19,7 @@ class HrController extends BaseController
      */
      */
     public function list(ManageHr $manageHr)
     public function list(ManageHr $manageHr)
     {
     {
-        $lists = $manageHr->lists($this->map,$this->page,$this->row,['sort','id']);
+        $lists = $manageHr->lists($this->map,$this->page,$this->row,['id','sort']);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['photo_gallery_link'] = json_decode($v['photo_gallery']);
                 $v['photo_gallery_link'] = json_decode($v['photo_gallery']);

@@ -55,7 +55,7 @@ class ComController extends BaseController
      */
      */
     public function getCustomMenu(){
     public function getCustomMenu(){
         $customModel = new CustomModule();
         $customModel = new CustomModule();
-        $list = $customModel->list(['status'=>0],['sort','id']);
+        $list = $customModel->list(['status'=>0],['topping_time','sort','id']);
         if(!empty($list)){
         if(!empty($list)){
             foreach ($list as $k=>$v){
             foreach ($list as $k=>$v){
                 $v['sub'] = [$v['name'].'管理',$v['name'].'分类'];
                 $v['sub'] = [$v['name'].'管理',$v['name'].'分类'];

@@ -14,10 +14,7 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleExtendLogic;
 use App\Http\Logic\Bside\CustomModule\CustomModuleExtendLogic;
 use App\Models\CustomModule\CustomModuleExtend;
 use App\Models\CustomModule\CustomModuleExtend;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
-<<<<<<< HEAD
 use App\Models\Product\Extend;
 use App\Models\Product\Extend;
-=======
->>>>>>> 8cd12bff1a9683bab5e510abdf95218a42999a27
 
 
 class CustomModuleExtentController extends BaseController
 class CustomModuleExtentController extends BaseController
 {
 {
@@ -87,7 +84,6 @@ class CustomModuleExtentController extends BaseController
     }
     }
 
 
     /**
     /**
-<<<<<<< HEAD
      * @remark :获取扩展模块的扩展字段
      * @remark :获取扩展模块的扩展字段
      * @name   :lists
      * @name   :lists
      * @author :lyh
      * @author :lyh
@@ -104,17 +100,4 @@ class CustomModuleExtentController extends BaseController
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
-=======
-     * @remark :
-     * @name   :getExtendContentList
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/20 15:21
-     */
-    public function getExtendContentList(){
-        $extendContentModel = new CustomModuleExtentContent();
-        $lists = $extend->list($this->map);
-        $this->response('success',Code::SUCCESS,$lists);
-    }
->>>>>>> 8cd12bff1a9683bab5e510abdf95218a42999a27
 }
 }

@@ -134,4 +134,21 @@ class CustomModuleLogic extends BaseLogic
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :设置排序
+     * @name   :setTopping
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/21 11:03
+     */
+    public function setTopping(){
+        ProjectServer::useProject($this->param['project_id']);
+        $moduleModel = new CustomModule();
+        $rs = $moduleModel->edit(['topping_time'=>date('Y-m-d H:i:s')],['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('置顶失败，请联系管理员');
+        }
+        DB::disconnect('custom_mysql');
+    }
 }
 }

@@ -26,9 +26,9 @@ class CustomTemplateRequest extends FormRequest
         return [
         return [
             'name'=>'required',
             'name'=>'required',
             'url'=>'required',
             'url'=>'required',
-//            'keywords'=>'required',
-//            'description'=>'required',
-//            'title'=>'required',
+            'keywords'=>'max:1000',
+//            'description'=>'max:500',
+            'title'=>'max:500',
         ];
         ];
     }
     }
 
 

@@ -313,6 +313,7 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::prefix('custom_module')->group(function () {
     Route::prefix('custom_module')->group(function () {
         Route::any('/', [\App\Http\Controllers\Aside\CustomModule\CustomModuleController::class, 'lists'])->name('custom_lists');
         Route::any('/', [\App\Http\Controllers\Aside\CustomModule\CustomModuleController::class, 'lists'])->name('custom_lists');
         Route::any('/save', [\App\Http\Controllers\Aside\CustomModule\CustomModuleController::class, 'save'])->name('custom_save');
         Route::any('/save', [\App\Http\Controllers\Aside\CustomModule\CustomModuleController::class, 'save'])->name('custom_save');
+        Route::any('/topping', [\App\Http\Controllers\Aside\CustomModule\CustomModuleController::class, 'topping'])->name('custom_topping');
         Route::any('/del', [\App\Http\Controllers\Aside\CustomModule\CustomModuleController::class, 'del'])->name('custom_del');
         Route::any('/del', [\App\Http\Controllers\Aside\CustomModule\CustomModuleController::class, 'del'])->name('custom_del');
     });
     });