From 0ea385ed33ace758d669b5ac863381deeeaf40bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Sat, 25 May 2024 17:12:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ShopInfoMapper.xml               | 1 +
 .../java/com/cool/store/service/impl/XfsgEhrServiceImpl.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index 527eeabf2..1156afa5f 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -135,6 +135,7 @@
         #{regionId}
       </foreach>
     </if>
+    order by a.update_time desc
   </select>
   <select id="getRegionIdByid" resultType="java.lang.Long">
     select r.parent_id
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java
index 16235cef2..e06dd3973 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cool.store.dto.StaffExamInfoDTO;
 import com.cool.store.dto.ehr.FranchiseeInfoDTO;
 import com.cool.store.dto.ehr.StaffBaseInfoDTO;
+import com.cool.store.exception.ServiceException;
 import com.cool.store.mq.util.HttpRestTemplateService;
 import com.cool.store.service.XfsgEhrService;
 import com.cool.store.utils.SecureUtil;
@@ -43,7 +44,7 @@ public class XfsgEhrServiceImpl implements XfsgEhrService {
         Integer code = result.getInteger("code");
         if (code != 0) {
             log.info("xfsg#getUserInfoByCode,staffNumber:{},请求失败", staffNumber);
-            return null;
+            throw new ServiceException("鲜丰水果"+result.getString("msg"));
         }
         JSONObject data = result.getJSONObject("data");
         if (data == null) {