供销

app/Service/QuantizationService.php

@@ -517,8 +517,8 @@ class QuantizationService extends Service
         if(! isset(QuantizationCreate::$type_name[$data['type']])) return [false, '量化档案类型错误'];
         if($q['type'] != $data['type']) return [false, '引用档案类型与量化档案类型不一致'];
         if($data['type'] == QuantizationCreate::type_one){
-            if(empty($data['address']) && ! is_string($data['address'])) return [false, '地点（省市）编码不能为空'];
-            if(empty($data['address_title']) && ! is_string($data['address_title'])) return [false, '地点（省市）不能为空'];
+            if(empty($data['address']) || ! is_string($data['address'])) return [false, '地点（省市）编码不能为空'];
+            if(empty($data['address_title']) || ! is_string($data['address_title'])) return [false, '地点（省市）不能为空'];
         }elseif($data['type'] == QuantizationCreate::type_two){
             if(empty($data['start_time']) || empty($data['end_time'])) return [false, '周期不能为空'];
             $data['start_time'] = $this->changeDateToDate($data['start_time']);