[智价云] 导出更新

app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

@@ -295,7 +295,6 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         return;
     }
 
-
     /**
      * 处理责任人展示信息
      * @author 唐远望
@@ -315,6 +314,7 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
                     }
                 }
                 $result[$key]['first_responsible_person_name'] = !empty($first_responsible_person_name) ? implode(',', $first_responsible_person_name) : '';
+
                 //查询责任人名称
                 $responsible_person = explode(',', $value['responsible_person']);
                 $responsible_person_name = [];
@@ -324,6 +324,7 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
                     }
                 }
                 $result[$key]['responsible_person_name'] = !empty($responsible_person_name) ? implode(',', $responsible_person_name) : '';
+
                 //查询来源责任人名称
                 $source_responsible_person = explode(',', $value['source_responsible_person']);
                 $source_responsible_person_name = [];
@@ -332,8 +333,16 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
                         $source_responsible_person_name[] = $member_list[$v];
                     }
                 }
-                $source_responsible_person_name = !empty($source_responsible_person_name) ? implode(',', $source_responsible_person_name) : '';
-                $result[$key]['source_responsible_person_name'] = $source_responsible_person_name;
+                // 修复：确保赋值的是字符串，而不是数组
+                $result[$key]['source_responsible_person_name'] = !empty($source_responsible_person_name) ? implode(',', $source_responsible_person_name) : '';
+
+                // 确保所有需要的字段都存在
+                if (!isset($result[$key]['merge_province_name'])) {
+                    $result[$key]['merge_province_name'] = $value['merge_province_name'] ?? '';
+                }
+                if (!isset($result[$key]['merge_city_name'])) {
+                    $result[$key]['merge_city_name'] = $value['merge_city_name'] ?? '';
+                }
             }
         }
         return $result;

app/Jobs/Manager/Other/ExportViolationProductJobs.php

@@ -308,6 +308,7 @@ class ExportViolationProductJobs implements ShouldQueue
                     }
                 }
                 $result[$key]['first_responsible_person_name'] = !empty($first_responsible_person_name) ? implode(',', $first_responsible_person_name) : '';
+
                 //查询责任人名称
                 $responsible_person = explode(',', $value['responsible_person']);
                 $responsible_person_name = [];
@@ -317,6 +318,7 @@ class ExportViolationProductJobs implements ShouldQueue
                     }
                 }
                 $result[$key]['responsible_person_name'] = !empty($responsible_person_name) ? implode(',', $responsible_person_name) : '';
+
                 //查询来源责任人名称
                 $source_responsible_person = explode(',', $value['source_responsible_person']);
                 $source_responsible_person_name = [];
@@ -325,8 +327,16 @@ class ExportViolationProductJobs implements ShouldQueue
                         $source_responsible_person_name[] = $member_list[$v];
                     }
                 }
-                $source_responsible_person_name = !empty($source_responsible_person_name) ? implode(',', $source_responsible_person_name) : '';
-                $result[$key]['source_responsible_person_name'] = $source_responsible_person_name;
+                // 修复：确保赋值的是字符串，而不是数组
+                $result[$key]['source_responsible_person_name'] = !empty($source_responsible_person_name) ? implode(',', $source_responsible_person_name) : '';
+
+                // 确保所有需要的字段都存在
+                if (!isset($result[$key]['merge_province_name'])) {
+                    $result[$key]['merge_province_name'] = $value['merge_province_name'] ?? '';
+                }
+                if (!isset($result[$key]['merge_city_name'])) {
+                    $result[$key]['merge_city_name'] = $value['merge_city_name'] ?? '';
+                }
             }
         }
         return $result;