增加非空判断

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -119,10 +119,10 @@ public class WxPortalController extends ApiBaseController {
     })
     @PostMapping("/ridingLantern")
     public Object getRidingLantern(){
-//        String userType="";
         ParameterObject obj = getParameterObject();
         Long userId = Long.valueOf(obj.getString("userId"));
         List<String> userTypeList = new ArrayList<>();
+        Set<String> userTypeSet = new HashSet<>();
         SysUserExt sysUserExt = sysUserExtService.selectSysUserExtById(userId);
         if (sysUserExt != null){
             String salesLevel = sysUserExt.getSalesLevel();
@@ -133,27 +133,30 @@ public class WxPortalController extends ApiBaseController {
             }
         }
         List<SysUserShopExt>  sysUserShopExt = sysUserShopExtService.selectSysUserShopExtById(obj.getString("userId"));
-        Set<String> userTypeSet = new HashSet<>();
-        for (SysUserShopExt shopExt : sysUserShopExt){
-            userTypeSet.add(shopExt.getIsShopType());
-        }
-        for (String userType : userTypeSet){
-            if ("0".equals(userType)){
-                userTypeList.add("2");
-            }else {
-                userTypeList.add("3");
+        if (sysUserShopExt != null && sysUserShopExt.size() > 0){
+            for (SysUserShopExt shopExt : sysUserShopExt){
+                userTypeSet.add(shopExt.getIsShopType());
+            }
+            for (String userType : userTypeSet){
+                if ("0".equals(userType)){
+                    userTypeList.add("2");
+                }else {
+                    userTypeList.add("3");
+                }
             }
         }
+
         List<SysRidingLantern> lanternList = sysRidingLanternService.selectLanternList();
         List<SysRidingLantern> lanternListhow=new ArrayList<>();
         if (lanternList != null && lanternList.size() > 0) {
             lanternList.forEach(lantern->{
                 //如果userType为空,则添加通知,
                 if (StringUtils.isEmpty(lantern.getUserType())){
+                    lantern.setUserType("");
                     lanternListhow.add(lantern);
                 }else {
                     String[] split = lantern.getUserType().split(",");
-                    for (String userTypeStr : userTypeList){
+                    for (String userTypeStr : userTypeSet){
                         boolean exists = Arrays.stream(split)
                                 .anyMatch(str -> str.equals(userTypeStr));
                         if (exists){