lsd/ks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改登录时，更新openid

Browse Source 
2.修改es排序问题
This commit is contained in:
sh
2026-06-01 16:08:06 +08:00
parent 6260b5347b
commit 110f514480
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java
View File

@@ -575,12 +575,10 @@ public class ESJobSearchImpl implements IESJobSearchService
wrapper.and(x->x.eq(ESJobDocument::getIsPublish,esJobSearch.getIsPublish())); wrapper.and(x->x.eq(ESJobDocument::getIsPublish,esJobSearch.getIsPublish()));
} }
if(Objects.nonNull(esJobSearch.getOrder())){ if(Objects.nonNull(esJobSearch.getOrder())){
wrapper.orderByDesc(ESJobDocument::getPostingDate);
if(esJobSearch.getOrder()==1){ if(esJobSearch.getOrder()==1){
wrapper.orderByDesc(ESJobDocument::getIsHot); wrapper.orderByDesc(ESJobDocument::getIsHot);
} }
if(esJobSearch.getOrder()==2){
wrapper.orderByDesc(ESJobDocument::getPostingDate);
}
if(esJobSearch.getOrder()==3){ if(esJobSearch.getOrder()==3){
wrapper.orderByDesc(ESJobDocument::getMaxSalary); wrapper.orderByDesc(ESJobDocument::getMaxSalary);
} }
@@ -695,9 +693,7 @@ public class ESJobSearchImpl implements IESJobSearchService
wrapper.and(x->x.eq(ESJobDocument::getIsPublish,jobQuery.getIsPublish())); wrapper.and(x->x.eq(ESJobDocument::getIsPublish,jobQuery.getIsPublish()));
} }
if(Objects.nonNull(jobQuery.getOrder())){ if(Objects.nonNull(jobQuery.getOrder())){
if (jobQuery.getOrder()==2){ wrapper.orderByDesc(ESJobDocument::getPostingDate);
wrapper.orderByDesc(ESJobDocument::getPostingDate);
}
if (jobQuery.getOrder()==1){ if (jobQuery.getOrder()==1){
wrapper.orderByDesc(ESJobDocument::getIsHot); wrapper.orderByDesc(ESJobDocument::getIsHot);
wrapper.orderByDesc(ESJobDocument::getApplyNum); wrapper.orderByDesc(ESJobDocument::getApplyNum);

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View File

@@ -519,6 +519,7 @@ public class SysLoginService
if (openidSpecialUser != null) { if (openidSpecialUser != null) {
System.out.printf("小程序登录-匹配到OpenID网格员：openid=%s, phone=%s%n", System.out.printf("小程序登录-匹配到OpenID网格员：openid=%s, phone=%s%n",
openidSpecialUser.getOpenid(), openidSpecialUser.getPhone()); openidSpecialUser.getOpenid(), openidSpecialUser.getPhone());
openidSpecialUser.setOpenid(dto.getOpenid());
return handleSpecialUserLogin(openidSpecialUser); return handleSpecialUserLogin(openidSpecialUser);
} }
@@ -527,6 +528,7 @@ public class SysLoginService
if (phoneSpecialUser != null) { if (phoneSpecialUser != null) {
System.out.printf("小程序登录-匹配到手机号网格员：phone=%s, openid=%s%n", System.out.printf("小程序登录-匹配到手机号网格员：phone=%s, openid=%s%n",
phoneSpecialUser.getPhone(), phoneSpecialUser.getOpenid()); phoneSpecialUser.getPhone(), phoneSpecialUser.getOpenid());
phoneSpecialUser.setOpenid(dto.getOpenid());
return handleSpecialUserLogin(phoneSpecialUser); return handleSpecialUserLogin(phoneSpecialUser);
} }