合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2054

@@ -30,11 +30,6 @@ class BTemplateModuleRandomController extends BaseController
      * @time   :2025/5/27 16:00
      */
     public function getRandomList(){
-        $this->request->validate([
-            'project_id'=>'required',
-        ],[
-            'project_id.required' => 'project_id不能为空',
-        ]);
         $data = $this->logic->getRandomList();
         $this->response('success',Code::SUCCESS,$data);
     }
@@ -50,12 +45,10 @@ class BTemplateModuleRandomController extends BaseController
         $this->request->validate([
             'module_id'=>'required',
             'uuid'=>'required',
-            'project_id'=>'required',
             'html'=>'required',
         ],[
             'module_id.required' => '左侧模块id不能为空',
             'uuid.required' => 'uuid唯一不能为空',
-            'project_id.required' => 'project_id不能为空',
             'html.required' => 'html不能为空',
         ]);
         $data = $this->logic->saveRandomModule();

@@ -33,6 +33,7 @@ class BTemplateModuleRandomLogic extends BaseLogic
         $info = $this->model->read(['project_id'=>$this->user['project_id'],'uuid'=>$this->param['uuid'],'module_id'=>$this->param['module_id']]);
         try {
             if($info === false){
+                $this->param['project_id'] = $this->user['project_id'];
                 //执行新增数据
                 $this->model->add($this->param);
             }else{
@@ -65,7 +66,7 @@ class BTemplateModuleRandomLogic extends BaseLogic
      * @time   :2025/5/27 15:47
      */
     public function getRandomInfo(){
-        $info = $this->model->read(['project_id'=>$this->user['project_id'],'uuid'=>$this->param['uuid'],'module_id'=>$this->param['module_id']]);
+        $info = $this->model->read(['uuid'=>$this->param['uuid']]);
         if($info === false){
             $info = [];
         }