解决冲突

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -232,7 +232,7 @@ public class ConfigureController extends AbstractBaseController {
                    } catch (Exception e) {
                     e.printStackTrace();
                 }
-                if (200 == sevenEntity.getStatus()) {
+                if (sevenEntity != null && 200 == sevenEntity.getStatus()) {
                     String json1 = JSON.toJSONString(sevenEntity.getResult());
                     List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
                     List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FireCar_Start") && t.get("FireCar_Start").equals("true"))).collect(Collectors.toList());