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日要求下载生成水印