Merge branch 'master' of

http://key@gitlab.egolm.com/hanxu/siff-film-api.git

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

@@ -621,7 +621,7 @@ public class FilmServiceImpl implements FilmService {
 	@Override
 	public List<Map<String, Object>> queryMonitorUploadList(String keyword,Integer upload_state, Page page) {
 		SqlWhere w = new SqlWhere().lk(new String[]{"file_name", "film_id"}, keyword).eq("upload_state", upload_state);
-		String sql = "select * from fc_film_upload  "+ StringUtil.join(" and ", " where ", "", "", w.getStringList());;
+		String sql = "select * from fc_film_upload  "+ StringUtil.join(" and ", " where ", "", "", w.getStringList())+" order by FIELD(`upload_state`,1,0,2,3) ";
 		return jdbcTemplate.limit(sql, page, w.getObjectArray());
 	}
 	/**