diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java index 410ed28..3815c23 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java @@ -575,12 +575,10 @@ public class ESJobSearchImpl implements IESJobSearchService wrapper.and(x->x.eq(ESJobDocument::getIsPublish,esJobSearch.getIsPublish())); } if(Objects.nonNull(esJobSearch.getOrder())){ + wrapper.orderByDesc(ESJobDocument::getPostingDate); if(esJobSearch.getOrder()==1){ wrapper.orderByDesc(ESJobDocument::getIsHot); } - if(esJobSearch.getOrder()==2){ - wrapper.orderByDesc(ESJobDocument::getPostingDate); - } if(esJobSearch.getOrder()==3){ wrapper.orderByDesc(ESJobDocument::getMaxSalary); } @@ -695,9 +693,7 @@ public class ESJobSearchImpl implements IESJobSearchService wrapper.and(x->x.eq(ESJobDocument::getIsPublish,jobQuery.getIsPublish())); } if(Objects.nonNull(jobQuery.getOrder())){ - if (jobQuery.getOrder()==2){ - wrapper.orderByDesc(ESJobDocument::getPostingDate); - } + wrapper.orderByDesc(ESJobDocument::getPostingDate); if (jobQuery.getOrder()==1){ wrapper.orderByDesc(ESJobDocument::getIsHot); wrapper.orderByDesc(ESJobDocument::getApplyNum); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index f0012d6..b8b966b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -519,6 +519,7 @@ public class SysLoginService if (openidSpecialUser != null) { System.out.printf("小程序登录-匹配到OpenID网格员:openid=%s, phone=%s%n", openidSpecialUser.getOpenid(), openidSpecialUser.getPhone()); + openidSpecialUser.setOpenid(dto.getOpenid()); return handleSpecialUserLogin(openidSpecialUser); } @@ -527,6 +528,7 @@ public class SysLoginService if (phoneSpecialUser != null) { System.out.printf("小程序登录-匹配到手机号网格员:phone=%s, openid=%s%n", phoneSpecialUser.getPhone(), phoneSpecialUser.getOpenid()); + phoneSpecialUser.setOpenid(dto.getOpenid()); return handleSpecialUserLogin(phoneSpecialUser); }