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

mall-server-api/src/main/java/com/gree/mall/manager/logic/comlist/ComListAllLogic.java

@@ -135,6 +135,7 @@ public class ComListAllLogic {
         bean.setFileUrl(file);
         bean.setIsDownload(false);
         bean.setCreateTime(new Date());
+        bean.setIsNotice(comList.getIsNotice());
         bean.insert();
 
         map.put(comList.getCompanyName(), comList.getId());
@@ -162,6 +163,7 @@ public class ComListAllLogic {
             comDetail.setFileUrl(filePath);
             comDetail.setIsDownload(false);
             comDetail.setCreateTime(new Date());
+            comDetail.setIsNotice(comList.getIsNotice());
             //comDetail.insert();
             comDetails.add(comDetail);
             //}
@@ -335,7 +337,7 @@ public class ComListAllLogic {
         if (CollectionUtils.isEmpty(comDetails)) {
             throw new RemoteServiceException("暂无您可下载的内容");
         }
-        this.download(comDetails, adminUser, response);
+        this.download(comDetails, adminUser,response);
     }
 
 
@@ -360,6 +362,7 @@ public class ComListAllLogic {
             comDetailLog.setUserName(admin.getUserName());
             comDetailLog.setWebsitId(comDetail.getWebsitId());
             comDetailLog.setWebsitName(websitMap.get(comDetail.getWebsitId()));
+            comDetailLog.setIsNotice(comDetail.getIsNotice());
             comDetailLog.insert();
         }
         List<Map<String, Object>> files = new ArrayList<>();
@@ -376,7 +379,7 @@ public class ComListAllLogic {
         if (files.size() > 1) {
             CommonUtils.writeZip(response, files);
         } else {
-            CommonUtils.downloadFile(files.get(0).get("fileUrl").toString(), websitMap.get(admin.getAdminWebsitIds().get(0)) + "-" + title + ".xlsx", response);
+            CommonUtils.downloadFile(files.get(0).get("fileUrl").toString(),files.get(0).get("fileName").toString() , response);
         }
         //CommonUtils.downloadFile(imgFile,admin.getWebsitNumber()+"-"+comDetail.getTitle()+".csv",response);
         //return imgFile;

mall-server-api/src/main/java/com/gree/mall/manager/logic/comlist/ComListLogic.java

@@ -135,6 +135,7 @@ public class ComListLogic {
         bean.setWebsitId(adminUser.getUserName());
         bean.setFileUrl(file);
         bean.setIsDownload(false);
+        bean.setIsNotice(comList.getIsNotice());
         bean.setCreateTime(new Date());
         bean.insert();
 
@@ -166,6 +167,7 @@ public class ComListLogic {
             comDetail.setFileUrl(filePath);
             comDetail.setIsDownload(false);
             comDetail.setCreateTime(new Date());
+            comDetail.setIsNotice(comList.getIsNotice());
             //comDetail.insert();
             comDetails.add(comDetail);
             //}
@@ -211,6 +213,7 @@ public class ComListLogic {
             comDetailLog.setTitle(comDetail.getTitle());
             comDetailLog.setUserName(admin.getUserName());
             comDetailLog.setWebsitId(comDetail.getWebsitId());
+            comDetailLog.setIsNotice(comDetail.getIsNotice());
             comDetailLog.setWebsitName(websitMap.get(comDetail.getWebsitId()));
             comDetailLog.insert();
         }