BoxAction Msg where update

application/index/controller/Cabinet.php

@@ -256,8 +256,18 @@ class Cabinet extends Base
     }
     public function BoxActionList(){
         $param = input('param.');
-        if(empty($param['cabinet_number']) || empty($param['box_number'])){
-            json_error(1007 , '柜子号码或箱子号码不能为空');
+        if(!empty($param['cabinet_number']) && !empty($param['box_number'])){
+            $where['cabinet_number'] = $param['cabinet_number'];
+            $where['box_number'] = $param['box_number'];
+        }
+        if(!empty($param['cabinet_number']) && empty($param['box_number'])){
+            $where['cabinet_number'] = $param['cabinet_number'];
+        }
+        if(empty($param['cabinet_number']) && empty($param['box_number'])){
+            $where = [];
+        }
+        if(empty($param['cabinet_number']) && !empty($param['box_number'])){
+            json_error(1007 , '柜子号码不能为空');
         }
         $where['cabinet_number'] = $param['cabinet_number'];
         $where['box_number'] = $param['box_number'];
@@ -279,11 +289,20 @@ class Cabinet extends Base
     }
     public function MsgList(){
         $param = input('param.');
-        if(empty($param['cabinet_number']) || empty($param['box_number'])){
-            json_error(1007 , '柜子号码或箱子号码不能为空');
+        if(!empty($param['cabinet_number']) && !empty($param['box_number'])){
+            $where['cabinet_number'] = $param['cabinet_number'];
+            $where['box_number'] = $param['box_number'];
         }
-        $where['cabinet_number'] = $param['cabinet_number'];
-        $where['box_number'] = $param['box_number'];
+        if(!empty($param['cabinet_number']) && empty($param['box_number'])){
+            $where['cabinet_number'] = $param['cabinet_number'];
+        }
+        if(empty($param['cabinet_number']) && empty($param['box_number'])){
+            $where = [];
+        }
+        if(empty($param['cabinet_number']) && !empty($param['box_number'])){
+            json_error(1007 , '柜子号码不能为空');
+        }
+
         $limit = isset($param['pageSize']) ? $param['pageSize'] : 10;
         $param['pageNumber'] = isset($param['pageNumber']) ? $param['pageNumber'] : 1;
         $offset = ($param['pageNumber'] - 1) * $limit;