Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruitApiController.java

@@ -147,8 +147,9 @@ public class RecruitApiController {
             }
 
             if("0".equals(status)){
-                sortList.add(new Sort("a.is_topping","desc"));
-                sortList.add(new Sort("a.update_time","desc"));
+                sortList.add(new Sort("IFNULL(a.is_topping,a.update_time)","desc"));
+//                sortList.add(new Sort("a.is_topping","desc"));
+//                sortList.add(new Sort("a.update_time","desc"));
                 if (StringUtils.isNotEmpty(content)) {
                     searchParams.put("content","%" + content.trim() + "%");
                 }
@@ -186,8 +187,6 @@ public class RecruitApiController {
                     searchParams.put("method",settlementMethod);
                 }
 
-                sortList.add(new Sort("a.sort_no","asc"));
-
                 if ("2".equals(statusType)) {
                     sortList.add(new Sort("a.browse_number","asc"));
                     sortList.add(new Sort("a.update_time","desc"));