Merge remote-tracking branch 'origin/develop_3' into develop_3

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

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);
-
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -1,7 +1,10 @@
 package com.adc.da.slrs.sarStandardsInfo.controller;
 
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.util.ZipUtil;
+import com.adc.da.att.entity.AttFileEO;
 import com.adc.da.common.FileUnZip;
 import com.adc.da.common.ReadExcel;
 import com.adc.da.exception.AdcDaBaseException;
@@ -17,6 +20,7 @@ import com.adc.da.util.LoginUserUtil;
 import com.adc.da.util.UUIDUtils;
 import com.adc.da.utils.util.*;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -38,6 +42,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;

adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java

@@ -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())) {
-//                if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
+                    userMsg += 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);