buwan-server.git

			@@ -92,7 +92,7 @@
			}

			@RequestMapping(value = "/videolist", method = RequestMethod.POST)
			public void videoList(int videotype, int page, String key, String type, String resourceIds, int contenttype, String freeType, PrintWriter out) {
			public void videoList(int videotype, int page, String key, String type, String resourceIds, int contenttype, String freeType, String area, PrintWriter out) {

			if (StringUtil.isNullOrEmpty(type)) {
			type = "name";
			@@ -139,6 +139,8 @@

			filter.setFreeType(freeTypeInt);

			filter.setArea(StringUtil.isNullOrEmpty(area) ? null : area.trim());

			SolrResultDTO dto = solrAlbumDataManager.find(filter, page, Constant.pageCount);
			if (dto.getVideoList() != null)
			for (SolrAlbumVideo videoInfo : (List<SolrAlbumVideo>) dto.getVideoList())
			@@ -170,8 +172,16 @@
			for (VideoAdminInfoVO a : voList) {
			VideoInfoExtra extra = maps.get(a.getId());
			if (extra != null) {
			if (!StringUtil.isNullOrEmpty(extra.gethPosterPicture()))
			a.setPicture(extra.gethPosterPicture());

			if (a.getHpicture() != null) {
			if (!StringUtil.isNullOrEmpty(extra.gethPosterPicture()))
			a.setHpicture(extra.gethPosterPicture());
			}

			if (a.getVpicture() != null) {
			if (!StringUtil.isNullOrEmpty(extra.getvPosterPicture()))
			a.setVpicture(extra.getvPosterPicture());
			}
			}
			}