diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 21f8eee5..6ede5f0f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -363,7 +363,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { // 电子签名进行base64拼接 if (StringUtils.isNotBlank(info.getLeaseSignUrl())) { - info.setLeaseSignUrl("data:image/png;base64," + info.getLeaseSignUrl()); + if (!info.getLeaseSignUrl().startsWith("http")) { + info.setLeaseSignUrl("data:image/png;base64," + info.getLeaseSignUrl()); + } } /** 设置发料单位 防止代码冲突 **/ @@ -388,7 +390,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { if (!CollectionUtils.isEmpty(approveSignList)) { for (LeaseOutSign leaseOutSign : approveSignList) { if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) { - leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl()); + if (!leaseOutSign.getOutSignUrl().startsWith("http")) { + leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl()); + } } } leaseApplyRequestVo.setApproveSignList(approveSignList); @@ -400,7 +404,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { if (!CollectionUtils.isEmpty(outSignList)) { for (LeaseOutSign applyInfo : outSignList) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { - applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl()); + if (!applyInfo.getOutSignUrl().startsWith("http")) { + applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl()); + } } } leaseApplyRequestVo.setKgSignList(outSignList); @@ -410,7 +416,11 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { bean.setConfirmPerson(details.get(0).getConfirmPerson()); LeaseConfirmSign confirmSign = leaseApplyInfoMapper.getLeaseConfirmSign(bean); if(confirmSign != null){ - confirmSign.setConfirmSignUrl("data:image/png;base64," + confirmSign.getConfirmSignUrl()); + if (StringUtils.isNotBlank(confirmSign.getConfirmSignUrl())) { + if (!confirmSign.getConfirmSignUrl().startsWith("http")) { + confirmSign.setConfirmSignUrl("data:image/png;base64," + confirmSign.getConfirmSignUrl()); + } + } leaseApplyRequestVo.setConfirmSign(confirmSign); } } @@ -420,7 +430,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { if (!CollectionUtils.isEmpty(signList)) { for (LeaseOutSign applyInfo : signList) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { - applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl()); + if (!applyInfo.getOutSignUrl().startsWith("http")) { + applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl()); + } } } leaseApplyRequestVo.setOutSignList(signList); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/materialStation/service/impl/ProAuthorizeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/materialStation/service/impl/ProAuthorizeServiceImpl.java index 9f441601..d7880cac 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/materialStation/service/impl/ProAuthorizeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/materialStation/service/impl/ProAuthorizeServiceImpl.java @@ -231,7 +231,11 @@ public class ProAuthorizeServiceImpl implements ProAuthorizeService { // 电子签名进行base64拼接 if(!detailsList.isEmpty()){ detailsList.forEach(details -> { - details.setSignName("data:image/png;base64," + details.getSignName()); + if (StringUtils.isNotBlank(details.getSignName())) { + if (!details.getSignName().startsWith("http")) { + details.setSignName("data:image/png;base64," + details.getSignName()); + } + } }); } info.setDetailsList(detailsList); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index f121fd92..dc87c11e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -914,7 +914,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { purchaseSignRecordUserSignList = signProcessMapper.getPurchaseSignUrlListByTaskId(purchaseCheckDetails.getTaskId()); for (PurchaseSignRecord purchaseSignRecord : purchaseSignRecordUserSignList) { if (StringUtils.isNotBlank(purchaseSignRecord.getSignUrl())) { - purchaseSignRecord.setSignUrl("data:image/png;base64," + purchaseSignRecord.getSignUrl()); + if (!purchaseSignRecord.getSignUrl().startsWith("http")) { + purchaseSignRecord.setSignUrl("data:image/png;base64," + purchaseSignRecord.getSignUrl()); + } } purchaseSignRecordMap.put(purchaseSignRecord.getSignUrl(), purchaseSignRecord); }