‘linchangsheng’ 6 月之前
父節點
當前提交
2bb0932dd3

+ 5 - 3
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,11 +337,11 @@ public class ComListAllLogic {
         if (CollectionUtils.isEmpty(comDetails)) {
             throw new RemoteServiceException("暂无您可下载的内容");
         }
-        this.download(comDetails, adminUser, comList,response);
+        this.download(comDetails, adminUser,response);
     }
 
 
-    private void download(List<ComDetail> comDetails, AdminUserCom admin,ComList comList, HttpServletResponse response) throws IOException {
+    private void download(List<ComDetail> comDetails, AdminUserCom admin, HttpServletResponse response) throws IOException {
         String title = comDetails.get(0).getTitle();
 
         final List<AdminWebsit> websitList = adminWebsitService.lambdaQuery()
@@ -360,7 +362,7 @@ public class ComListAllLogic {
             comDetailLog.setUserName(admin.getUserName());
             comDetailLog.setWebsitId(comDetail.getWebsitId());
             comDetailLog.setWebsitName(websitMap.get(comDetail.getWebsitId()));
-            comDetailLog.setIsNotice(comList.getIsNotice());
+            comDetailLog.setIsNotice(comDetail.getIsNotice());
             comDetailLog.insert();
         }
         List<Map<String, Object>> files = new ArrayList<>();

+ 5 - 3
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);
             //}
@@ -188,10 +190,10 @@ public class ComListLogic {
         if (CollectionUtils.isEmpty(comDetails)) {
             throw new RemoteServiceException("暂无您可下载的内容");
         }
-        this.download(comDetails, adminUser,comList, response);
+        this.download(comDetails, adminUser, response);
     }
 
-    private void download(List<ComDetail> comDetails, AdminUserCom admin,ComList comList, HttpServletResponse response) throws IOException {
+    private void download(List<ComDetail> comDetails, AdminUserCom admin, HttpServletResponse response) throws IOException {
         String title = comDetails.get(0).getTitle();
 
         final List<AdminWebsit> websitList = adminWebsitService.lambdaQuery()
@@ -211,7 +213,7 @@ public class ComListLogic {
             comDetailLog.setTitle(comDetail.getTitle());
             comDetailLog.setUserName(admin.getUserName());
             comDetailLog.setWebsitId(comDetail.getWebsitId());
-            comDetailLog.setIsNotice(comList.getIsNotice());
+            comDetailLog.setIsNotice(comDetail.getIsNotice());
             comDetailLog.setWebsitName(websitMap.get(comDetail.getWebsitId()));
             comDetailLog.insert();
         }