Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -919,8 +919,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
      */
     public void downLoadResults(HttpServletResponse response) throws IOException {
         //public static final ThreadLocal<Map<String, List<ErrorRow>>> errorRows = new ThreadLocal<>();
-
-        String fileName = "导入失败条目清单.xls";
+        String fileName;
+        if (errorRows.get() == null || errorRows.get().size() == 0) {
+            fileName = "导入成功.xls";
+        } else {
+            fileName = "导入失败条目清单.xls";
+        }
         response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
         response.setHeader("content-Type", "application/vnd.ms-excel");
         response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "UTF-8"));