*）图片移到附件分组

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPSubServiceImpl.java

@@ -385,9 +385,12 @@ public class DPSubServiceImpl {
             jsonObject.put("value", param.getString(fieldKey));
         } else {
             if ("upload".equals(xObj.getString("componentKey"))) {
-                jsonObject.put("type", "img");
+                JSONArray attachmentUploadDatas = matinfo.getJSONArray("datas");
                 if (!ValidationUtil.isEmpty(value)) {
-                    jsonObject.put("value", ((JSONArray) value).getJSONObject(0).getString("url"));
+                    JSONObject attachmentUploadDatasObj = new JSONObject();
+                    attachmentUploadDatasObj.put("value", value);
+                    attachmentUploadDatasObj.put("type", "img");
+                    attachmentUploadDatas.add(attachmentUploadDatasObj);
                 }
             } else if ("attachmentUpload".equals(xObj.getString("componentKey"))) {
                 JSONArray attachmentUploadDatas = matinfo.getJSONArray("datas");
@@ -431,7 +434,7 @@ public class DPSubServiceImpl {
                 }
             }
         }
-        if (!"attachmentUpload".equals(xObj.getString("componentKey"))){
+        if (!"upload".equals(xObj.getString("componentKey")) || !"attachmentUpload".equals(xObj.getString("componentKey"))){
             datas.add(jsonObject);
         }
         return datas;