Merge remote-tracking branch 'origin/master'

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

@@ -217,6 +217,9 @@ public class RecruitmentApiController {
             String educationN = dataDictionaryService.getName(recruitment.getEducation());
             recruitment.setEducationName(educationN);
 
+            WorkCategory workCategory = workCategoryService.get(recruitment.getPosition());
+            recruitment.setPositionName(workCategory.getName());
+
             //热度
 //            int heatNum = userBrowseService.findNumberByRId(recruitment.getId());
 //            if(heatNum < 0 ){
@@ -294,7 +297,7 @@ public class RecruitmentApiController {
         Recruitment recruitment = recruitmentService.get(id);//id 数据
         String relevantTitle = recruitment.getTitle();//标题
 
-        sortList.add(new Sort("jr.id_","asc"));
+        sortList.add(new Sort("jr.create_time","desc"));
 
         searchParams.put("relevantTitle", "%"+relevantTitle+"%");
         searchParams.put("notrelevantId", id);
@@ -322,7 +325,7 @@ public class RecruitmentApiController {
 
         List<Sort> sortList = new ArrayList<>();
 
-        sortList.add(new Sort("bc.id_","asc"));
+        sortList.add(new Sort("jr.create_time","desc"));
 
         if (StringUtils.isNotEmpty(id)) {
             searchParams.put("id", "%"+id+"%");