Merge branch '20250210_lj_zhanqun' into dev

app/Controller/NewsController.php

@@ -613,13 +613,19 @@ class NewsController extends AbstractController
              $requireData,
              [
                  'name'=> 'required',
-                 'price'=> 'required',
-                 'stock'=> 'required',
+                 'price'=> 'required|numeric',
+                 'min'=> 'numeric',
+                 'max'=> 'numeric',
+                 'hits  '=> 'numeric',
              ],
              [
                  'name.required' => '产品名称不能为空',
                  'price.required' => '产品价格不能为空',
-                 'stock.required' => '产品库存不能为空',
+                 'price.numeric' => '价格必须是数字',
+                 'min.numeric' => 'min必须是数字',
+                 'max.numeric' => 'max须是数字',
+                 'hits.numeric' => '点击量必须是数字',
+          
              ]
          );
          if ($validator->fails()) {

app/Controller/WebsiteController.php

@@ -1626,26 +1626,30 @@ class WebsiteController extends AbstractController
 
          //获取用户信息
          $user_id = Context::get("UserId");
+         var_dump("用户id：",$user_id);
          $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
          var_dump("用户信息：",$userInfo);
          $sszq = $userInfo['data']['sszq'];
-         if($sszq == ""){
-             return Result::error("请配置用户的网站标识");
-         }
-         //获取websiteid
-         $groupInfo = $this->websiteServiceClient->getWebsiteGroupInfo(['id' => $sszq]);
-         var_dump("groupInfo:",$groupInfo);
-         if(empty($groupInfo['data'])){
-             return Result::error("没有找到该网站标识");
-         }
-         if(empty($groupInfo['data']['web_ids'])){
-            return Result::error("该网站标识没有绑定网站");
+         $type_id = $userInfo['data']['type_id'];
+         if($type_id != 10000){
+            if($sszq == ""){
+                return Result::error("请配置用户的网站标识");
+            }
+            //获取websiteid
+            $groupInfo = $this->websiteServiceClient->getWebsiteGroupInfo(['id' => $sszq]);
+            var_dump("groupInfo:",$groupInfo);
+            if(empty($groupInfo['data'])){
+                return Result::error("没有找到该网站标识");
+            }
+            if(empty($groupInfo['data']['web_ids'])){
+               return Result::error("该网站标识没有绑定网站");
+            }
+            $sszqarr =  json_decode($groupInfo['data']['web_ids']);
+            var_dump($website_id = Context::get("SiteId")??2 ,'------------website------'); 
+           if (!in_array($website_id, $sszqarr)) {
+               return Result::error("您没有权限访问该网站");
+           } 
          }
-         $sszqarr =  json_decode($groupInfo['data']['web_ids']);
-         var_dump($website_id = Context::get("SiteId")??2 ,'------------website------'); 
-        if (!in_array($website_id, $sszqarr)) {
-            return Result::error("您没有权限访问该网站");
-        }
         $result = $this->websiteServiceClient->getWebsiteNavList($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']); 
     }