From 30f6b276dfc4c5753b6bf5b4f18b5a30281e0726 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 8 Apr 2022 17:39:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=85=A5=E5=BA=93=20=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/workFlow/service/ActSarItemsLawsEOService.java | 4 ++--
 .../service/impl/SarLawsStandInfoServiceImpl.java             | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java
index ce514f49..5f2acefa 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java
@@ -123,11 +123,11 @@ public class ActSarItemsLawsEOService {
                 String result = "";
                 if(StringUtils.isNotBlank(standMap.get(entry.getKey()).toString())){
                     Object value= new JSONTokener(standMap.get(entry.getKey()).toString()).nextValue();
-                    if(value instanceof org.json.JSONArray){
+                    if(value instanceof org.json.JSONArray && !",".contains(standMap.get(entry.getKey()).toString())){
                         result = String.join(",",JSONObject.parseArray(value.toString(),String.class));
                     }else {
                         if(!value.equals("null")){
-                            result =value.toString();
+                            result =standMap.get(entry.getKey()).toString();
                         }
                     }
                 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
index f7ad9321..91dfa614 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
@@ -877,6 +877,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
                         fileIds += attrValue + ",";
                     } else if (InitStandAttrUtil.multiTimeFieldList.contains(attrKey)) {
                         multiTimeMap.put(attrKey,attrValue);
+                        attrValue = "'" + attrValue + "'";
                     }
                     // 不同类型存储数据需单独处理值
                     if (InitStandAttrUtil.numFieldListLaws.contains(attrKey)) {