非空判断

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

 package com.gic.enterprise.web.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.ChannelResourceDTO;
@@ -10,7 +9,10 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.data.api.dto.*;
 import com.gic.data.api.service.MemberDataApiService;
 import com.gic.data.api.service.StoreStatisicsApiService;
-import com.gic.enterprise.dto.*;
+import com.gic.enterprise.dto.HelpCenterDTO;
+import com.gic.enterprise.dto.IndexModuleDTO;
+import com.gic.enterprise.dto.PushTypeDTO;
+import com.gic.enterprise.dto.UserMessageDTO;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.qo.PageQO;
 import com.gic.enterprise.service.HelpCenterApiService;
@@ -33,7 +35,6 @@ import com.gic.store.dto.StoreSearchDTO;
 import com.gic.store.service.ProvincesApiService;
 import com.gic.store.service.StoreApiService;
 import com.gic.store.service.StoreWidgetApiService;
-import org.apache.catalina.User;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -44,7 +45,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -315,7 +319,7 @@ public class IndexModuleController {
         List<ResouceVO> applet = new ArrayList<>();
         List<ResouceVO> service = new ArrayList<>();
         List<ResouceVO> card = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(appletConfigIdList)){
+        if(CollectionUtils.isNotEmpty(appletConfigIdList) && CollectionUtils.isNotEmpty(appletList)){
             for(Long s : appletConfigIdList){
                 for(AppletsConfigSimpleOutputDTO dto : appletList){
                     if(s.longValue() == dto.getAppletConfigId().longValue()){
@@ -327,7 +331,7 @@ public class IndexModuleController {
                 }
             }
         }
-        if(CollectionUtils.isNotEmpty(serviceConfigIdList)){
+        if(CollectionUtils.isNotEmpty(serviceConfigIdList) && CollectionUtils.isNotEmpty(serviceList)){
             for(Long s : serviceConfigIdList){
                 for(ServiceConfigSimpleOutputDTO dto : serviceList){
                     if(s.longValue() == dto.getServiceConfigId().longValue()){
@@ -339,7 +343,7 @@ public class IndexModuleController {
                 }
             }
         }
-        if(CollectionUtils.isNotEmpty(cardConfigIdList)){
+        if(CollectionUtils.isNotEmpty(cardConfigIdList) && CollectionUtils.isNotEmpty(memberCardList)){
             for(Long s : cardConfigIdList){
                 for(OwnerMemberCardDTO dto : memberCardList){
                     if(s.longValue() == dto.getCardConfigId().longValue()){