Browse Source

no message

FengChaoYu 9 months ago
parent
commit
26c44c3dc5

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

@@ -1,19 +1,15 @@
 package com.gree.mall.manager.logic.notice;
 
 import cn.hutool.core.bean.BeanUtil;
-
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.notice.*;
 import com.gree.mall.manager.commonmapper.NoticeRecordBeanMapper;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.IsEnum;
 import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.logic.admin.AdminUserLogic;
 import com.gree.mall.manager.logic.common.CommonLogic;
@@ -30,7 +26,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 @Component
@@ -333,12 +331,12 @@ public class NoticeLogic {
 
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        List<String> adminCompanyIds = adminUser.getAdminWebsitIds();
-
-        if (CollectionUtil.isEmpty(adminCompanyIds)) {
+        if (CollectionUtil.isEmpty(adminUser.getAdminWebsitIds())) {
             return new ArrayList<>();
         }
 
+        List<String> adminCompanyIds = adminUser.getAdminWebsitIds();
+
         Date date = new Date();
         DateTime dateTime = DateUtil.offsetSecond(date, -1*num);