代码提交

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/controller/ProjectReportSignatureWorkController.java

@@ -141,7 +141,9 @@ public class ProjectReportSignatureWorkController extends BaseController {
                 }else{
                     officeWork.setReportSignatureUrlFlag(0);
                 }
-            }else if (StringUtils.isNotBlank(officeWork.getApprovalId())){
+            }
+
+            if (StringUtils.isNotBlank(officeWork.getApprovalId())){
                 if(StringUtils.isNotBlank(officeWork.getApprovalSignatureUrl())){
                     officeWork.setApprovalSignatureUrlFlag(1);
                     //处理文件路径

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList.jsp

@@ -518,8 +518,10 @@
                     ,"number":"${projectReportSignature.number}"
                     ,"signatureUrlFlag":"${projectReportSignature.signatureUrlFlag}"
                     ,"signatureContractId":"${projectReportSignature.signatureContractId}"
+                    ,"reportSignatureUrl":"${projectReportSignature.reportSignatureUrl}"
                     ,"reportSignatureUrlFlag":"${projectReportSignature.reportSignatureUrlFlag}"
                     ,"reportSignatureContractId":"${projectReportSignature.reportSignatureContractId}"
+                    ,"approvalSignatureUrl":"${projectReportSignature.approvalSignatureUrl}"
                     ,"approvalSignatureUrlFlag":"${projectReportSignature.approvalSignatureUrlFlag}"
                     ,"approvalSignatureContractId":"${projectReportSignature.approvalSignatureContractId}"
                     ,"createName":"<c:out value="${projectReportSignature.createBy.name}" escapeXml="false"/>"