修改公证员

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

@@ -601,10 +601,18 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		if (notarization != null) {
 			orderDetail.setNotarizationNo(notarization.getDocNo());
 			orderDetail.setNotarizaitonSignTime(notarization.getAxqSignedTime());
-			orderDetail.setAuthNotarization(FileUploadUtil.getPreviewUrl(notarization.getSignedPdfUrl()));
+			//判断是否为空
+			if(org.apache.commons.lang3.StringUtils.isNotBlank(notarization.getSignedPdfUrl())) {
+				orderDetail.setAuthNotarization(FileUploadUtil.getPreviewUrl(notarization.getSignedPdfUrl()));
+			}
+			
 		}
 		if (note != null) {
-			orderDetail.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
+			//判断是否为空
+			if(org.apache.commons.lang3.StringUtils.isNotBlank(note.getSignedPdfUrl())) {
+				orderDetail.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
+			}
+		
 		}
 		if (!StringUtils.isEmpty(orderDetail.getNotaryUserId())) {
 			SysUserEntity user = userMapper.selectById(orderDetail.getNotaryUserId());

eladmin-system/src/main/java/me/zhengjie/base/util/CFCACertUtil.java

@@ -446,7 +446,7 @@ public class CFCACertUtil {
 		}
 		//公证员签名
 		if (notaryUser != null) {
-			SignKeywordVO keywordNotaryUser = getSignKeywork("公证员：", "70", "0", "160", "60");
+			SignKeywordVO keywordNotaryUser = getSignKeywork("signed", "70", "0", "160", "60");
 			setSignInfoDefault(notaryUser, keywordNotaryUser);
 			notaryUserInfos.add(notaryUser);
 		}