需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/notice/NoticeLogic.java

@@ -354,24 +354,26 @@ public class NoticeLogic {
                 .between(NoticeRecord::getIssueTime, dateTime, date1)
                 .list());
 
-        List<NoticeWebsitRecord> noticeWebsitRecords = noticeWebsitRecordService.lambdaQuery()
-                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), NoticeWebsitRecord::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .in(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminWebsitIds())
-                .eq(NoticeWebsitRecord::getReadFlag,IsYesNoEnum.NO.getKey())
-                .between(NoticeWebsitRecord::getIssueTime, dateTime, date1).list();
-
-        if (CollectionUtils.isNotEmpty(noticeWebsitRecords)){
-            List<NoticeWebsit> noticeWebsits = noticeWebsitService.lambdaQuery().in(NoticeWebsit::getNoticeWebsitId,
-                    noticeWebsitRecords.stream().map(NoticeWebsitRecord::getNoticeWebsitId).collect(Collectors.toList()))
-                    .list();
-
-            for (NoticeWebsit noticeWebsit : noticeWebsits) {
-                NoticeRecord noticeRecord = new NoticeRecord();
-                noticeRecord.setId(noticeWebsit.getNoticeWebsitId());
-                noticeRecord.setType(noticeWebsit.getType());
-                noticeRecord.setAdminNoticeType("WDTZ");
-                noticeRecord.setTitle(noticeWebsit.getTitle());
-                list.add(noticeRecord);
+        if (adminUser.getType().equals(0)) {
+            List<NoticeWebsitRecord> noticeWebsitRecords = noticeWebsitRecordService.lambdaQuery()
+                    .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), NoticeWebsitRecord::getCompanyWechatId, adminUser.getCompanyWechatId())
+                    .in(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminWebsitIds())
+                    .eq(NoticeWebsitRecord::getReadFlag, IsYesNoEnum.NO.getKey())
+                    .between(NoticeWebsitRecord::getIssueTime, dateTime, date1).list();
+
+            if (CollectionUtils.isNotEmpty(noticeWebsitRecords)) {
+                List<NoticeWebsit> noticeWebsits = noticeWebsitService.lambdaQuery().in(NoticeWebsit::getNoticeWebsitId,
+                        noticeWebsitRecords.stream().map(NoticeWebsitRecord::getNoticeWebsitId).collect(Collectors.toList()))
+                        .list();
+
+                for (NoticeWebsit noticeWebsit : noticeWebsits) {
+                    NoticeRecord noticeRecord = new NoticeRecord();
+                    noticeRecord.setId(noticeWebsit.getNoticeWebsitId());
+                    noticeRecord.setType(noticeWebsit.getType());
+                    noticeRecord.setAdminNoticeType("WDTZ");
+                    noticeRecord.setTitle(noticeWebsit.getTitle());
+                    list.add(noticeRecord);
+                }
             }
         }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/notice/NoticeWebsitLogic.java

@@ -102,9 +102,7 @@ public class NoticeWebsitLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         noticeBean.setCompanyWechatId(adminUser.getCompanyWechatId());
         noticeBean.setCompanyWechatName(adminUser.getCompanyName());
-        noticeBean.setIssueNickName(adminUser.getNickName());
-        noticeBean.setIssueTime(new Date());
-        noticeBean.setIssueUserId(adminUser.getAdminUserId());
+
         noticeBean.updateById();
 
         List<NoticeWebsitRecord> noticeWebsitRecords = new ArrayList<>();
@@ -132,11 +130,12 @@ public class NoticeWebsitLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         NoticeWebsit noticeWebsit = noticeWebsitService.getById(id);
         noticeWebsit.setStatus(status);
-        noticeWebsit.setIssueNickName(adminUser.getNickName());
-        noticeWebsit.setIssueTime(new Date());
-        noticeWebsit.setIssueUserId(adminUser.getAdminUserId());
-        if (status.equals("SEND"))
+
+        if (status.equals("SEND")) {
+            noticeWebsit.setIssueNickName(adminUser.getNickName());
             noticeWebsit.setIssueTime(new Date());
+            noticeWebsit.setIssueUserId(adminUser.getAdminUserId());
+        }
         noticeWebsit.updateById();
 
         noticeWebsitRecordService.lambdaUpdate()