Revert "最新"

This reverts commit 9f82519e
2021-07-30 16:26:27 +08:00
parent d71c4a81e1
commit d7a2285d75
3 changed files with 5 additions and 9 deletions
@@ -276,14 +276,13 @@ public class AttFileEOController {
            TsUser tsUser = userDao.selectById(userId);
            if (tsUser != null) {
                userMsg = tsUser.getUname() + ",";
-                //2021/7/28水印内容取消工号
-//                if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
-//                    userMsg += tsUser.getWorkNum() + ",";
-//                }
+                if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
+                    userMsg += tsUser.getWorkNum() + ",";
+                }
            }
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
            String date = df.format(new Date());
-            String waterContent = userMsg+date ;
+            String waterContent = userMsg + date;
            //2020年9月5日  去掉水印处理
            //2021年7月25日要求下载生成水印
            WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);