feature 代码提交

qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/FileFormatConversionServiceImpl.java

@@ -91,7 +91,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
         String waterMarkStr = "";
         if (waterMark) {
             SysUserVo currentUser = QHSEUtils.getCurrentUser();
-            waterMarkStr = String.format(DEFAULT_WATER_MARK, StringUtils.isBlank(currentUser.getCode()) ? "" : currentUser.getCode(), currentUser.getName());
+            waterMarkStr = String.format(DEFAULT_WATER_MARK, StringUtils.isBlank(currentUser.getCode()) ? currentUser.getAccount(): currentUser.getCode(), currentUser.getName());
         }
         FontSettings fontSettings = new FontSettings();
         fontSettings.setFontsFolder("/usr/share/fonts/simsun.ttc", true); // 指定中文字体目录