Merge remote-tracking branch 'remotes/origin/V0.0.8' into V0.0.9

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -304,8 +304,8 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         //审批人
         data.put("approveUser", StringUtils.isNotEmpty(approveLog.getApproveUser()) ? approveLog.getApproveUser() : StringUtil.EMPTY_STRING);
         //来访单位
-        String outOrgName = ObjectUtil.isNotEmpty(outOrg.getShortName()) ? outOrg.getShortName() : outOrg.getName();
-        data.put("outOrgName", outOrgName);
+//        String outOrgName = ObjectUtil.isNotEmpty(outOrg.getShortName()) ? outOrg.getShortName() : outOrg.getName();
+        data.put("outOrgName", record.getCompanyName());
         //来访人员
         data.put("userName", record.getUserName());
         //证件类型

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -459,7 +459,7 @@ public class PdfUtil {
         createPDFCell(tableFont, table, "点评总结", Element.ALIGN_MIDDLE, 1, 1);
         createPDFCell(tableFont, table, data.get("comment").toString(), Element.ALIGN_LEFT, 5, 1);
         //参会人员签字
-        createPDFCell(tableFont, table, "参会人员签字", Element.ALIGN_MIDDLE, 1, 1);
+        createPDFCell(tableFont, table, "参演人员", Element.ALIGN_MIDDLE, 1, 1);
         dealEduImageCell((List<String>) data.get("signImage"), table, 5, 40, 40);
         document.add(table);