x

src/main/java/com/egolm/film/api/service/FilmService.java

@@ -136,7 +136,7 @@ public interface FilmService {
 	 * @param page
 	 * @return
 	 */
-	List<Map<String, Object>> queryReviewList(String keyword, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short,
+	List<Map<String, Object>> queryReviewList(String keyword, Integer group_id, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short,
 			String film_country, Integer[] review_round, Integer[] review_state, Page page);
 
 	void allot(Long member_film_id, Integer review_round, Integer[] user_id);

src/main/java/com/egolm/film/api/service/impl/FilmServiceImpl.java

@@ -494,11 +494,11 @@ public class FilmServiceImpl implements FilmService {
 	 * 检索审片列表
 	 */
 	@Override
-	public List<Map<String, Object>> queryReviewList(String keyword, Integer enroll_type_id, Integer film_type_name,
+	public List<Map<String, Object>> queryReviewList(String keyword, Integer group_id, Integer enroll_type_id, Integer film_type_name,
 			Integer film_type_name_short, String film_country, Integer[] review_round, Integer[] review_state,
 			Page page) {
 		SqlWhere w1 = new SqlWhere()
-				.append("mf.film_type_name in (select film_type_id from fc_admin_group_filmtype where group_id = ?)", group_id)
+				.where("mf.film_type_name in (select film_type_id from fc_admin_group_filmtype where group_id = ?)", group_id)
 				.gt("mf.review_round", 0)
 				.lk(new String[]{"mf.en_name", "mf.cn_name"}, keyword)
 				.eq("mf.film_type_name", film_type_name)

src/main/java/com/egolm/film/api/web/admin/AdminAuthController.java

@@ -206,7 +206,7 @@ public class AdminAuthController {
 			group.setCreate_time(System.currentTimeMillis());
 		}
 		service.mergeGroup(group);
-		return Rjx.jsonOk();
+		return Rjx.jsonOk().setData(group);
 	}
 	
 }

src/main/java/com/egolm/film/api/web/admin/AdminReviewController.java

@@ -13,6 +13,7 @@ import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
 import com.egolm.film.api.service.AdminTokenService;
 import com.egolm.film.api.service.FilmService;
+import com.egolm.film.bean.Fc_admin;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -48,8 +49,8 @@ public class AdminReviewController {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
-		Integer adminid = (Integer)tokenService.getToken().getId();
-		List<Map<String, Object>> list = filmService.queryReviewList(keyword, enroll_type_id, film_type_name, film_type_name_short, film_country, review_round, review_state, page);
+		Fc_admin admin = (Fc_admin)tokenService.getTokenObj();
+		List<Map<String, Object>> list = filmService.queryReviewList(keyword, admin.getGroup_id(), enroll_type_id, film_type_name, film_type_name_short, film_country, review_round, review_state, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	} 
 	

src/main/java/com/egolm/film/util/SqlWhere.java

@@ -15,10 +15,12 @@ public class SqlWhere {
 		this.objList = new ArrayList<Object>();
 	}
 	
-	public SqlWhere append(String where, Object obj) {
+	public SqlWhere where(String where, Object[] obj) {
 		if(StringUtil.isNotBlank(where)) {
 			this.strList.add(where);
-			this.objList.add(obj);
+			for(Object o : obj) {
+				this.objList.add(obj);
+			}
 		}
 		return this;
 	}