From 060062e743968233a2e10c3fd645614710abfbda Mon Sep 17 00:00:00 2001 From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com> Date: Tue, 28 Jul 2020 17:38:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=BA=E6=9C=8D=E5=8A=A1=E4=B8=93=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/ServiceEvaluateService.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Service/ServiceEvaluateService.php b/app/Service/ServiceEvaluateService.php index db18c17..6a2bd96 100644 --- a/app/Service/ServiceEvaluateService.php +++ b/app/Service/ServiceEvaluateService.php @@ -41,8 +41,7 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface ['user_id','=',$user_id], ['status','=',1] ]) - ->select('id') - ->first(); + ->exists(); return $res; } @@ -65,14 +64,14 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface public function getEvaluateList($data) { //踩坑 paginate 只能接收int型参数 - $par_page = $data['par_page'] > 0 ? intval($data['par_page']) : '6'; + $per_page = isset($data['per_page']) && $data['per_page'] > 0 ? intval($data['per_page']) : 6; //查询评论列表 按照创建时间降序排序 $res = Db::table('lanzu_service_evaluate as e') ->join('ims_cjdc_user as u','u.id','=','e.user_id') ->where(['e.service_personnel_id'=>$data['service_personnel_id']]) ->select('e.*','u.name','u.img') ->orderBy('created_at','desc') - ->paginate($par_page); + ->paginate($per_page); return $res; } From 430c6fe9191d9f725e8fb0cd06d0b222135e8b70 Mon Sep 17 00:00:00 2001 From: weigang Date: Tue, 28 Jul 2020 18:22:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?between=E8=A7=84=E5=88=99=E5=AF=B9=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E8=AE=A1=E7=AE=97=E6=9C=89bug=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=80=E4=B8=AA=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Listener/ValidatorFactoryResolvedListener.php | 5 +++++ app/Request/EvaluateRequest.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Listener/ValidatorFactoryResolvedListener.php b/app/Listener/ValidatorFactoryResolvedListener.php index cca8dd3..74f4f20 100644 --- a/app/Listener/ValidatorFactoryResolvedListener.php +++ b/app/Listener/ValidatorFactoryResolvedListener.php @@ -37,5 +37,10 @@ class ValidatorFactoryResolvedListener implements ListenerInterface }); + // 注册了 strlen 验证器规则 + $validatorFactory->extend('strlen', function ($attribute, $value, $parameters, $validator) { + return strlen($value)>=$parameters[0] && strlen($value)<=$parameters[1]; + }); + } } \ No newline at end of file diff --git a/app/Request/EvaluateRequest.php b/app/Request/EvaluateRequest.php index 5d7d53c..03f6e95 100644 --- a/app/Request/EvaluateRequest.php +++ b/app/Request/EvaluateRequest.php @@ -25,7 +25,7 @@ class EvaluateRequest extends FormRequest 'c_attitude' => 'required|nonempty|integer', 'c_service' => 'required|nonempty|integer', 'c_quality' => 'required|nonempty|integer', - 'content' => 'required|nonempty|between:15,150', + 'content' => 'required|nonempty|strlen:15,150', 'user_id' => 'required|nonempty|integer|exists:ims_cjdc_user,id', 'service_personnel_id' => 'required|nonempty|integer|exists:lanzu_service_personnel,id', 'market_id' => 'required|nonempty|integer|exists:ims_cjdc_market,id',