Merge remote-tracking branch 'origin/feature-2022.07.29' into feature-2022.07.29

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -594,10 +594,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		orderDetail.setOtherUploadUrl(otherUploadUrl);
 		// 共同责任人身份证正面照片
 		String jointIdCardFront = fileInfoService.getImageUrl(orderDetail.getJointIdcardFrontPic(), map);
-		orderDetail.setJointIdcardFrontPic(jointIdCardFront);
+		orderDetail.setJointIdcardFrontPicUrl(jointIdCardFront);
 		// 共同责任人身份证反面照片
 		String jointIdCardBack = fileInfoService.getImageUrl(orderDetail.getJointIdcardBackPic(), map);
-		orderDetail.setJointIdcardBackPic(jointIdCardBack);
+		orderDetail.setJointIdcardBackPicUrl(jointIdCardBack);
 		OrderFileEntity notarization = orderFileRepository.getOrderNotarization(businessNo);
 		OrderFileEntity note = orderFileRepository.getOrderNote(businessNo);
 		if (notarization != null) {

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/FileInfoServiceImpl.java

@@ -10,6 +10,8 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import lombok.RequiredArgsConstructor;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
@@ -133,8 +135,12 @@ public class FileInfoServiceImpl implements FileInfoService {
 	}
 
 	public String getImageUrl(String imageId, Map<Integer, FileInfoEntity> map) {
-		FileInfoEntity info = map.get(Integer.parseInt(imageId));
-		String imageUrl = FileUploadUtil.getFileUrl(info.getPath());
+		String imageUrl = "";
+		if (StringUtils.isNoneBlank(imageId)) {
+			FileInfoEntity info = map.get(Integer.parseInt(imageId));
+			imageUrl = FileUploadUtil.getFileUrl(info.getPath());
+		}
+
 		return imageUrl;
 	}