Commit 7998ed38 authored by Quxl's avatar Quxl

x

parent ec5233df
...@@ -460,7 +460,7 @@ public class FilmServiceImpl implements FilmService { ...@@ -460,7 +460,7 @@ public class FilmServiceImpl implements FilmService {
where2.lk(new String[]{"t.en_name", "t.cn_name", "t.director_name"}, keyword); where2.lk(new String[]{"t.en_name", "t.cn_name", "t.director_name"}, keyword);
} }
} }
sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", " ", " ", where2.getStringList()) + " order by t.film_no desc, t.id desc"; sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", " ", " ", where2.getStringList()) + " order by t.id desc";
Object[] ary2 = where2.getObjectArray(); Object[] ary2 = where2.getObjectArray();
for(Object obj : ary2) { for(Object obj : ary2) {
objs.add(obj); objs.add(obj);
......
...@@ -24,7 +24,7 @@ public class LogServiceImpl implements LogService { ...@@ -24,7 +24,7 @@ public class LogServiceImpl implements LogService {
public List<Map<String, Object>> queryLogList(String type, String username, Page page) { public List<Map<String, Object>> queryLogList(String type, String username, Page page) {
SqlWhere where = new SqlWhere().eq("t.type", type).eq("t.username", username); SqlWhere where = new SqlWhere().eq("t.type", type).eq("t.username", username);
String sql = "select l.*, le.ext, ifnull(ifnull(u.username, m.username), a.realname) username from fc_logs l left join fc_logs_ext le on le.path = l.path left join fc_user u on u.uid = l.loginid and l.type = 'USER' left join fc_member m on m.id = l.loginid and l.type = 'MEMBER' left join fc_admin a on a.adminid = l.loginid and l.type = 'ADMIN'"; String sql = "select l.*, le.ext, ifnull(ifnull(u.username, m.username), a.realname) username from fc_logs l left join fc_logs_ext le on le.path = l.path left join fc_user u on u.uid = l.loginid and l.type = 'USER' left join fc_member m on m.id = l.loginid and l.type = 'MEMBER' left join fc_admin a on a.adminid = l.loginid and l.type = 'ADMIN'";
sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", "", "", where.getStringList()); sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", "", "", where.getStringList()) + " order by t.create_time desc";
return jdbcTemplate.limit(sql, page, where.getObjectArray()); return jdbcTemplate.limit(sql, page, where.getObjectArray());
} }
......
...@@ -125,7 +125,7 @@ public class ReviewServiceImpl implements ReviewService { ...@@ -125,7 +125,7 @@ public class ReviewServiceImpl implements ReviewService {
} else { } else {
w2.where("(t.en_name like ? or t.cn_name like ? or t.director_name like ?)", new Object[] {lkstr, lkstr, lkstr}); 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()); sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", " ", " ", w2.getStringList()) + " order by t.id desc";
w1.getObjectList().addAll(w2.getObjectList()); w1.getObjectList().addAll(w2.getObjectList());
} }
return jdbcTemplate.limit(sql, page, w1.getObjectArray()); return jdbcTemplate.limit(sql, page, w1.getObjectArray());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment