From c3b3d492e5a01cf69002b572ec6c599b9af9c2b6 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 24 Nov 2022 10:44:06 +0800
Subject: [PATCH] =?UTF-8?q?thirdlogin/worklogin=EF=BC=8C=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E8008=EF=BC=8C=E5=89=8D=E7=AB=AF=E5=A5=BD?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
index cef85d6713..07f60c2ecd 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
@@ -195,7 +195,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
         //2022.11.24校验下用户是否被禁用
         //2.1根据手机号查询到用户信息 前端不跳转，暂时先注释吧
-       /* ThirdCustomerStaffFormDTO dto = new ThirdCustomerStaffFormDTO();
+        ThirdCustomerStaffFormDTO dto = new ThirdCustomerStaffFormDTO();
         dto.setCustomerId(staffLatestAgencyResultDTO.getCustomerId());
         dto.setMobile(staffLatestAgencyResultDTO.getMobile());
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserOpenFeignClient.getCustsomerStaffByIdAndPhone(dto);
@@ -203,9 +203,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
             logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", staffLatestAgencyResultDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
             throw new RenException(customerStaffResult.getCode());
         }
+        // 8008 前端会提示：登录失效，请重新登录 跳转到登录界面。所以这里写死返回8008.
         if("disabled".equals(customerStaffResult.getData().get(NumConstant.ZERO).getEnableFlag())){
-            throw new EpmetException(EpmetErrorCode.GOV_STAFF_DISABLED.getCode(),EpmetErrorCode.GOV_STAFF_DISABLED.getMsg(),EpmetErrorCode.GOV_STAFF_DISABLED.getMsg());
-        }*/
+            throw new EpmetException(EpmetErrorCode.PLEASE_LOGIN.getCode(),EpmetErrorCode.GOV_STAFF_DISABLED.getMsg(),EpmetErrorCode.GOV_STAFF_DISABLED.getMsg());
+        }
 
         //3.记录staff_wechat
         this.savestaffwechat(staffLatestAgencyResultDTO.getStaffId(), userWechatDTO.getWxOpenId(), staffLatestAgencyResultDTO.getCustomerId());