更新文件 advertiseAction.java

mhotel/src/com/happy/action/advertiseAction.java

@@ -155,11 +155,14 @@ public class advertiseAction extends ActionSupport implements ServletRequestAwar
                 return null;
             }
             List<Advertise> open = advertiseService.queryOpenAdvertise();
-            if (open.size()>=3 && advertise.getJumpWay().equals("小程序") && advertise.getState()==1){
-                resultjson.put("message", "小程序最多开启三个广告");
-                resultjson.put("code", 500);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
-                return null;
+            if (open!=null){
+                List<Integer> ids = open.stream().map(Advertise::getId).collect(Collectors.toList());
+                if (open.size()>=3 && advertise.getJumpWay().equals("小程序") && !ids.contains(advertise.getId()) && advertise.getState()==1){
+                    resultjson.put("message", "小程序最多开启三个广告");
+                    resultjson.put("code", 500);
+                    ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+                    return null;
+                }
             }
             advertise.setCreateTime(TimeExchange.getTime());
             if (advertise.getJumpWay().equals("小程序") && advertise.getJumpDirection().equals("民宿") && !advertise.getJumpPoint().equals("首页")){
@@ -233,12 +236,14 @@ public class advertiseAction extends ActionSupport implements ServletRequestAwar
                 return null;
             }
             List<Advertise> open = advertiseService.queryOpenAdvertise();
-            List<Integer> ids = open.stream().map(Advertise::getId).collect(Collectors.toList());
-            if (open.size()>=3 && advertise.getJumpWay().equals("小程序") && !ids.contains(advertise.getId()) && advertise.getState()==1){
-                resultjson.put("message", "小程序最多开启三个广告");
-                resultjson.put("code", 500);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
-                return null;
+            if (open!=null){
+                List<Integer> ids = open.stream().map(Advertise::getId).collect(Collectors.toList());
+                if (open.size()>=3 && advertise.getJumpWay().equals("小程序") && !ids.contains(advertise.getId()) && advertise.getState()==1){
+                    resultjson.put("message", "小程序最多开启三个广告");
+                    resultjson.put("code", 500);
+                    ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+                    return null;
+                }
             }
             if (advertise.getJumpWay().equals("小程序") && advertise.getJumpDirection().equals("民宿") && !advertise.getJumpPoint().equals("首页")){
                 AdminManager adminManager = adminManagerService.getById(Integer.parseInt(advertise.getJumpPoint()));
@@ -376,12 +381,14 @@ public class advertiseAction extends ActionSupport implements ServletRequestAwar
             return null;
         }
         List<Advertise> open = advertiseService.queryOpenAdvertise();
-        List<Integer> ids = open.stream().map(Advertise::getId).collect(Collectors.toList());
-        if (open.size()>=3 && advertise.getJumpWay().equals("小程序") && !ids.contains(advertise.getId()) && state==1){
-            resultJson.put("message", "小程序最多开启三个广告");
-            resultJson.put("code", 500);
-            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-            return null;
+        if (open!=null){
+            List<Integer> ids = open.stream().map(Advertise::getId).collect(Collectors.toList());
+            if (open.size()>=3 && advertise.getJumpWay().equals("小程序") && !ids.contains(advertise.getId()) && state==1){
+                resultJson.put("message", "小程序最多开启三个广告");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
         }
         int m = advertiseService.updateState(id,state);
         if (m>0){