x

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.egolm.common.StringUtil;
 import com.egolm.common.Util;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
@@ -88,10 +87,9 @@ public class AdminReviewController {
 			Integer opt_state, 
 			Long index,
 			Long limit,
-			String limitKey) {
+			String[] limitKey) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
-		limitKey = StringUtil.isBlank(limitKey) ? "film_no desc" : limitKey;
 		Page page = new Page(index, limit, limitKey);
 		Fc_admin admin = Util.mapTo(tokenService.getTokenObj(), Fc_admin.class);
 		List<Map<String, Object>> list = reviewService.queryReviewListForAdmin(

src/main/java/com/egolm/film/api/web/user/UserReviewController.java

@@ -57,6 +57,7 @@ public class UserReviewController {
 		@ApiImplicitParam(paramType = "query", dataType = "int",       required = false, name = "enroll_type_id", value="申报奖项ID"),
 		@ApiImplicitParam(paramType = "query", dataType = "long",      required = false, name = "index",     value="分页页码"),
 		@ApiImplicitParam(paramType = "query", dataType = "long",      required = false, name = "limit",     value="分页大小"),
+		@ApiImplicitParam(paramType = "query", dataType = "string",    required = false, name = "limitKey",     value="分页排序"),
 	})
 	public Object getReviewList(
 			boolean is_review, 
@@ -67,11 +68,12 @@ public class UserReviewController {
 			Integer film_type_id, 
 			Integer enroll_type_id, 
 			String keyword, 
+			String[] limitKey,
 			Long index, 
 			Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
-		Page page = new Page(index, limit);
+		Page page = new Page(index, limit, limitKey);
 		LoginToken loginToken = tokenService.getToken();
 		Integer user_id = (Integer)loginToken.getId();
 		List<Map<String, Object>> list = service.queryReviewListForUser(is_review, user_id, keyword, start_date, end_date, review_start_date, review_end_date, film_type_id, enroll_type_id, page);