From 110f514480e63457085e2061d0c02cd97bbc8584 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Mon, 1 Jun 2026 16:08:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0openid=202.=E4=BF=AE=E6=94=B9es?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java  | 8 ++------
 .../com/ruoyi/framework/web/service/SysLoginService.java  | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

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);
             }