Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -157,9 +157,13 @@ class SuppliersController extends BaseController
         $action_name = 'supplier_area';
         $action_name = 'supplier_area';
         $param = [
         $param = [
             'prod_desc'=>$this->param['prod_desc'] ?? '',
             'prod_desc'=>$this->param['prod_desc'] ?? '',
-            'start_date'=>$this->param['start_date'] ?? '',
-            'end_date'=>$this->param['end_date'] ?? '',
         ];
         ];
+        if(isset($this->param['start_date'] )){
+            $param['start_date'] = $this->param['start_date'] ?? '';
+        }
+        if(isset($this->param['end_date'] )){
+            $param['end_date'] = $this->param['end_date'] ?? '';
+        }
         $res = $this->_action($api_url,$action_name,$param);
         $res = $this->_action($api_url,$action_name,$param);
         $this->response('success',Code::SUCCESS,$res);
         $this->response('success',Code::SUCCESS,$res);
     }
     }
@@ -176,8 +180,10 @@ class SuppliersController extends BaseController
         $action_name = 'trade_partner';
         $action_name = 'trade_partner';
         $param = [
         $param = [
             'com_id'=>$this->param['com_id'] ?? '',
             'com_id'=>$this->param['com_id'] ?? '',
-            'com_role'=>$this->param['com_role'] ?? '',
         ];
         ];
+        if(isset($this->param['com_role'] )){
+            $param['com_role'] = $this->param['com_role'] ?? '';
+        }
         $res = $this->_action($api_url,$action_name,$param);
         $res = $this->_action($api_url,$action_name,$param);
         $this->response('success',Code::SUCCESS,$res);
         $this->response('success',Code::SUCCESS,$res);
     }
     }

@@ -83,10 +83,28 @@ class TranslateLogic extends BaseLogic
 
 
             }
             }
         }
         }
+        $data = $this->unique_multidimensional_array($data);
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
     /**
     /**
+     * @remark :多维数组去重
+     * @name   :unique_multidimensional_array
+     * @author :lyh
+     * @method :post
+     * @time   :2024/3/8 16:38
+     */
+    public function unique_multidimensional_array($array) {
+        // 将多维数组转换为字符串并进行去重
+        $uniqueArray = array_map('json_encode', $array);
+        // 去除重复项
+        $uniqueArray = array_unique($uniqueArray);
+        // 将字符串转换回多维数组
+        $uniqueArray = array_map('json_decode', $uniqueArray);
+        return $uniqueArray;
+    }
+
+    /**
      * @remark :获取图片列表
      * @remark :获取图片列表
      * @name   :imageList
      * @name   :imageList
      * @author :lyh
      * @author :lyh