xx

src/main/java/com/egolm/film/api/admin/AdminFirstController.java

@@ -47,11 +47,11 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",       value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",       value="分页大小"),
 	})
-	public Object list(String keyword, Integer state, String film_type, String enroll_type, Long index, Long limit) {
+	public Object list(String keyword, Integer state, Integer apply_state, String film_type, String enroll_type, Long index, Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
-		List<Map<String, Object>> list = memberService.queryChuShenList(keyword, state, film_type, enroll_type, page);
+		List<Map<String, Object>> list = memberService.queryChuShenList(keyword, state, apply_state, film_type, enroll_type, page);
 		return Rjx.jsonOk().setData(list);
 	}
 	

src/main/java/com/egolm/film/api/member/service/MemberService.java

@@ -133,7 +133,7 @@ public interface MemberService {
 
 	List<Map<String, Object>> queryListAll(String keyword);
 
-	List<Map<String, Object>> queryChuShenList(String keyword, Integer state, String film_type, String enroll_type,
+	List<Map<String, Object>> queryChuShenList(String keyword, Integer state, Integer apply_state, String film_type, String enroll_type,
 			Page page);
 
 }

src/main/java/com/egolm/film/api/member/service/impl/MemberServiceImpl.java

@@ -496,8 +496,8 @@ public class MemberServiceImpl implements MemberService {
 	}
 
 	@Override
-	public List<Map<String, Object>> queryChuShenList(String keyword, Integer state, String film_type, String enroll_type, Page page) {
-		SqlWhere where = new SqlWhere().olike(new String[]{"en_name", "cn_name"}, keyword).eq("state", state).eq("apply_state", 1).eq("film_type", film_type).eq("enroll_type", enroll_type);
+	public List<Map<String, Object>> queryChuShenList(String keyword, Integer state, Integer apply_state, String film_type, String enroll_type, Page page) {
+		SqlWhere where = new SqlWhere().olike(new String[]{"en_name", "cn_name"}, keyword).eq("state", state).eq("apply_state", apply_state).eq("film_type", film_type).eq("enroll_type", enroll_type);
 		String sql = "select * from fc_member_film" + StringUtil.join(" and ", " where ", "", "", where.getStringList());
 		Object[] objs = where.getObjectList();
 		return jdbcTemplate.limit(sql, page, objs);