Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

app/api/service/passport/Login.php

@@ -330,7 +330,10 @@ class Login extends BaseService
             return;
         }
         // 推荐人ID
-        $refereeId = (int)$data['refereeId'] ?? null;
+        $refereeId = 0;
+        if (!empty($data['refereeId'])) {
+            $refereeId = intval($data['refereeId']);
+        }
         // 用户不存在: 创建一个新用户
         $this->createUser($data['mobile'], $data['isParty'], $data['partyData'], $refereeId);
     }

app/common/model/Goods.php

@@ -312,8 +312,7 @@ class Goods extends BaseModel
 
         //关键字搜索 wanghousheng
         if (!empty($param['keyword'])) {
-            $query = $query->where('goods_name', 'like', "%{$param['keyword']}%")
-                ->whereOr('goods_no', 'like', "%{$param['keyword']}%");
+            $query = $query->whereRaw('goods_name like ? or goods_no like ?', ["%{$param['keyword']}%", "%{$param['keyword']}%"]);
         }
         // 执行查询
         $list = $query->with(['images.file'])