Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, 政策入库 新增 多选日期

See merge request LiuChao/foton-slrs-system-rest!448

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();
                         }
                     }
                 }

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)) {