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