Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5SwiperPictureController.java

@@ -39,34 +39,30 @@
         return;

      }



      try {

         

         List<SwiperPicture> list = swiperPictureService.getByBannerCard(card);

         if (list == null || list.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

            return;

         }



         for (SwiperPicture swiperPicture: list) {

            swiperPicture.setBannerId(null);

            swiperPicture.setCreatetime(null);

            swiperPicture.setUpdatetime(null);

            swiperPicture.setState(null);

            swiperPicture.setRemark(null);

         }

			
         GsonBuilder gsonBuilder = new GsonBuilder();

         gsonBuilder.serializeNulls();

         Gson gson = gsonBuilder.create();

			
         JSONObject data = new JSONObject();

         data.put("result_list", gson.toJson(list));

			
         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

			
      } catch (SwiperPictureException e) {

         e.printStackTrace();

      List<SwiperPicture> list = swiperPictureService.getByBannerCard(card);

      if (list == null || list.size() == 0) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

         return;

      }



      for (SwiperPicture swiperPicture: list) {

         swiperPicture.setBannerId(null);

         swiperPicture.setCreatetime(null);

         swiperPicture.setUpdatetime(null);

         swiperPicture.setState(null);

         swiperPicture.setRemark(null);

      }

		
      GsonBuilder gsonBuilder = new GsonBuilder();

      gsonBuilder.serializeNulls();

      Gson gson = gsonBuilder.create();

		
      JSONObject data = new JSONObject();

      data.put("result_list", gson.toJson(list));

		
      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

			
   }



}