moonsflyer 7 månader sedan
förälder
incheckning
3c81a07e13

+ 1 - 0
app/adminapi/controller/agricultural_machinery/UserServiceController.php

@@ -222,6 +222,7 @@ class UserServiceController extends BaseAdminController
 
     public function getMechanicalCateList()
     {
+        $params = (new UserServiceValidate())->get()->goCheck('mechanical');
         return $this->dataLists(new MechanicalCateLists());
     }
 

+ 2 - 1
app/adminapi/lists/agricultural_machinery/MechanicalCateLists.php

@@ -39,7 +39,8 @@ class MechanicalCateLists extends BaseAdminDataLists implements ListsSearchInter
     public function setSearch(): array
     {
         return [
-            '%like%' => ['name']
+            '%like%' => ['name'],
+            '=' => ['type']
         ];
     }
     /**

+ 4 - 2
app/adminapi/validate/agricultural_machinery/UserServiceValidate.php

@@ -78,9 +78,11 @@ class UserServiceValidate extends BaseValidate
     public function sceneDisclaimer(){
         return $this->only(['disclaimer']);
     }
-
+    public function sceneMechanical(){
+        return $this->only(['type']);
+    }
     public function sceneAddMechanicalCate(){
-        return $this->only(['name']);
+        return $this->only(['name','type']);
     }
     public function sceneEditCate(){
         return $this->only(['name']);

+ 2 - 1
app/api/controller/ServiceController.php

@@ -196,7 +196,8 @@ class ServiceController extends BaseApiController
 
     public function getMechanicalCateList(){
 
-        $params = $this->request->get();
+
+        $params = (new ServiceValidate())->get()->goCheck('mechanical');
         $result = ServiceLogic::getsMechanicalCateLists($params);
         return $this->data($result);
     }

+ 1 - 0
app/api/logic/ServiceLogic.php

@@ -230,6 +230,7 @@ class ServiceLogic extends BaseLogic
         if(isset($get['name'])){
             $where[]=['name','like','%'.$get['name'].'%'];
         }
+        $where[]=['type','=',$get['type']];
         $cate_list = MechanicalCate::where($where)->field('id,name')->order('sort desc,id asc')->select()->toArray();
 
         return $cate_list;

+ 1 - 0
app/api/validate/ServiceValidate.php

@@ -81,6 +81,7 @@ class ServiceValidate extends BaseValidate
         'cate'=>['type'],
         'serviceRenew'=>['type'],
         'log'=>['log_type'],
+        'mechanical'=>['type'],
     ];
 
     /**