From 857c6be6359fc299f61b9c41dfc4adab1ac0c0ad Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 1 Jul 2020 09:06:01 +0800
Subject: [PATCH] =?UTF-8?q?enterOrg=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/GovLoginServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
index 56720ae8b7..61358a0c6b 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
@@ -272,9 +272,9 @@ public class GovLoginServiceImpl implements GovLoginService {
             throw new RenException(customerStaffDTOResult.getCode());
         }
         CustomerStaffDTO customerStaff = customerStaffDTOResult.getData();
-        if(null==customerStaff.getPassword()||"".equals(customerStaff.getPassword().trim())){
+        /*if(null==customerStaff.getPassword()||"".equals(customerStaff.getPassword().trim())){
             throw new RenException(EpmetErrorCode.PLEASE_ACTIVATE_CURRENT_CUSTOMER_ACCOUNT.getCode());
-        }
+        }*/
         //2、解析微信用户
         WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(LoginConstant.APP_GOV, formDTO.getWxCode());
         //3、记录staff_wechat,并记录用户激活状态，激活时间