enterOrg接口修改

epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java

@@ -272,6 +272,9 @@ public class GovLoginServiceImpl implements GovLoginService {
             throw new RenException(customerStaffDTOResult.getCode());
         }
         CustomerStaffDTO customerStaff = customerStaffDTOResult.getData();
+        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,并记录用户激活状态，激活时间

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -33,6 +33,7 @@ public enum EpmetErrorCode {
 	PLEASE_LOGIN(8008,"请重新登录"),
 	PASSWORD_ERROR(8009,"密码错误,请重新输入"),
 	PLEASE_ACTIVATE_ACCOUNT(8010,"请先使用验证码登录激活账户"),
+	PLEASE_ACTIVATE_CURRENT_CUSTOMER_ACCOUNT(8011,"当前组织下，账号未激活，请先使用验证码登录"),
 	MOBILE_HAS_BEEN_USED(8101, "该手机号已注册，请更换手机号或使用原绑定的微信账号登录"),
 	MOBILE_CODE_ERROR(8102, "验证码错误"),
 	AUTO_CONFIRM_FAILED(8103, "党员注册失败"),