05a0488c by xu

Merge remote-tracking branch 'origin/develop' into develop

2 parents 22eb9cdc ea241076
...@@ -61,6 +61,6 @@ public class EnterpriseRegisterRQVO { ...@@ -61,6 +61,6 @@ public class EnterpriseRegisterRQVO {
61 private EnterpriseSubordinateRQVO extendInfo; 61 private EnterpriseSubordinateRQVO extendInfo;
62 62
63 @Schema(title = "法人用户身份附件信息") 63 @Schema(title = "法人用户身份附件信息")
64 private AttachmentCommonVO attachInfo; 64 private List<AttachmentCommonVO> attachInfos;
65 65
66 } 66 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -293,13 +293,17 @@ public class DataPortServiceImpl implements DataPortService { ...@@ -293,13 +293,17 @@ public class DataPortServiceImpl implements DataPortService {
293 if (ObjectUtils.isNotEmpty(authorizationLetter)) { 293 if (ObjectUtils.isNotEmpty(authorizationLetter)) {
294 JSONArray jsonArray = JSON.parseArray(authorizationLetter); 294 JSONArray jsonArray = JSON.parseArray(authorizationLetter);
295 if (ObjectUtils.isNotEmpty(jsonArray)) { 295 if (ObjectUtils.isNotEmpty(jsonArray)) {
296 JSONObject jsonObject = jsonArray.getJSONObject(0); 296 List<AttachmentCommonVO> attachInfos = new ArrayList<>();
297 for (int i = 0; i < jsonArray.size(); i++) {
298 JSONObject jsonObject = jsonArray.getJSONObject(i);
297 AttachmentCommonVO attachInfo = new AttachmentCommonVO(); 299 AttachmentCommonVO attachInfo = new AttachmentCommonVO();
298 attachInfo.setAttachType("授权委托书"); 300 attachInfo.setAttachType("授权委托书");
299 String name = jsonObject.getString("name"); 301 String name = jsonObject.getString("name");
300 attachInfo.setAttachName(StringUtils.isNotEmpty(name) ? name.split("\\.")[0] : name); 302 attachInfo.setAttachName(StringUtils.isNotEmpty(name) ? name.split("\\.")[0] : name);
301 attachInfo.setVerifyUrl(jsonObject.getString("url")); 303 attachInfo.setVerifyUrl(jsonObject.getString("url"));
302 enterpriseRegisterRQVO.setAttachInfo(attachInfo); 304 attachInfos.add(attachInfo);
305 }
306 enterpriseRegisterRQVO.setAttachInfos(attachInfos);
303 } 307 }
304 } 308 }
305 309
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!