From 2b1178e2894bb445f9cd5b03e51be8ddc28714a2 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 5 May 2022 17:00:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96ES?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/mq/SendBussMQService.java    | 8 ++++++--
 .../src/main/java/com/adc/da/mq/SendLawsMQService.java    | 8 ++++++--
 .../src/main/java/com/adc/da/mq/SendStandMQService.java   | 4 ++--
 .../service/impl/SarStandardsInfoServiceImpl.java         | 3 +++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
index 5ca1d5ef..7ebeed33 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
@@ -186,8 +186,12 @@ public class SendBussMQService {
             String fieldFilter = field.toLowerCase();
             if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){
                 Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue();
-                if(!json.toString().equals("null")){
-                    fieldValue = infoMap.get(fieldFilter).toString();
+                if(json instanceof org.json.JSONArray){
+                    fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(infoMap.get(fieldFilter).toString(),String.class));
+                }else {
+                    if(!("null").equals(json)){
+                        fieldValue = infoMap.get(fieldFilter).toString();
+                    }
                 }
             }
             saveMap.put(field+"Name",fieldValue);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java
index c81169d4..f7190b42 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java
@@ -232,8 +232,12 @@ public class SendLawsMQService {
             String fieldFilter = field.toLowerCase();
             if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){
                 Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue();
-                if(!json.toString().equals("null")){
-                    fieldValue = infoMap.get(fieldFilter).toString();
+                if(json instanceof org.json.JSONArray){
+                    fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(infoMap.get(fieldFilter).toString(),String.class));
+                }else {
+                    if(!("null").equals(json)){
+                        fieldValue = infoMap.get(fieldFilter).toString();
+                    }
                 }
             }
             saveMap.put(field+"Name",fieldValue);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
index 9bcc232a..19f86cb3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
@@ -187,10 +187,10 @@ public class SendStandMQService {
                 if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){
                     Object json= new JSONTokener(infoMap.get(field).toString()).nextValue();
                     if(json instanceof org.json.JSONArray){
-                        fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(standMap.get(field).toString(),String.class));
+                        fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(infoMap.get(field).toString(),String.class));
                     }else {
                         if(!("null").equals(json)){
-                            fieldValue = standMap.get(field).toString();
+                            fieldValue = infoMap.get(field).toString();
                         }
                     }
                 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index f28db1f3..f605e2b0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -3014,6 +3014,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             for (int i = 0; i < attidlist.length; i++) {
                 if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && (attidlist[i].contains("att_file") || attidlist[i].contains("ATT_FILE"))) {
                     AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i].trim());
+                    if (null == attFileEO) {
+                        continue;
+                    }
                     String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
 //                    String readFilePath = "E:\\上汽企标流程总览.pdf";
                     try {