From 32afc5475f94713dda50c85c4caaeee91f42c328 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 27 Jul 2021 16:18:58 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=B5=B7?=
 =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=A0=87=E5=87=86=E5=90=8E=EF=BC=8C=E5=9C=A8=E6=AD=A4?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E6=AD=A4?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E7=9A=84=E9=97=AE=E9=A2=98"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9cd93436
---
 .../com/adc/da/slrs/sarResource/dao/TsResourceDao.java    | 3 ---
 .../com/adc/da/att/controller/AttFileEOController.java    | 8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
index de959ae0..335a7986 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
@@ -3,7 +3,6 @@ package com.adc.da.slrs.sarResource.dao;
 import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -20,6 +19,4 @@ public interface TsResourceDao extends BaseMapper<TsResource> {
 
     List<TsResource> selectMenuByRole(TsResource sarMenuEO);
 
-    int insertTsRoleResource(HashMap<String,Object> map);
-
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
index c5cc4baa..cc34cb29 100644
--- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
@@ -273,19 +273,15 @@ public class AttFileEOController {
             String waterFilePath = newFilePath + attFileEO.getOldFileName();
             // 添加水印
             String userMsg = "";
-            String date="";
             TsUser tsUser = userDao.selectById(userId);
             if (tsUser != null) {
                 userMsg = tsUser.getUname() + ",";
                 if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
                     userMsg += tsUser.getWorkNum() + ",";
                 }
-            }else {
-                //没有用户信息时
-                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
-                 date = df.format(new Date());
             }
-
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
+            String date = df.format(new Date());
             String waterContent = userMsg + date;
             //2020年9月5日  去掉水印处理
             //2021年7月25日要求下载生成水印