x

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

@@ -125,7 +125,7 @@ public class ReviewServiceImpl implements ReviewService {
 			} else {
 				w2.where("(t.en_name like ? or t.cn_name like ? or t.director_name like ?)", new Object[] {lkstr, lkstr, lkstr});
 			}
-			sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", " ", " ", w2.getStringList()) + " order by t.id desc";
+			sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", " ", " ", w2.getStringList());
 			w1.getObjectList().addAll(w2.getObjectList());
 		}
 		return jdbcTemplate.limit(sql, page, w1.getObjectArray());

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

@@ -14,6 +14,7 @@ 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;
@@ -73,6 +74,7 @@ public class AdminReviewController {
 		@ApiImplicitParam(paramType="query", dataType="int",     required=false, name="opt_state",            value="评选状态 0未评选 1有争议 2管理员分配 3已完成"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",                value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",                value="分页大小"),
+		@ApiImplicitParam(paramType="query", dataType="string",  required=true,  name="limitKey",             value="排序关键字"),
 	})
 	public Object list(
 			String keyword, 
@@ -85,10 +87,12 @@ public class AdminReviewController {
 			Integer allot_state, 
 			Integer opt_state, 
 			Long index,
-			Long limit) {
+			Long limit,
+			String limitKey) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
-		Page page = new Page(index, 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(
 				keyword,