diff --git a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java
index b805bbf217..f01e6ef096 100644
--- a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java
+++ b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java
@@ -29,7 +29,7 @@ public interface GovLoginService {
      * @Description 3、手机验证码获取组织
      * @Date 2020/4/18 21:11
      **/
-    Result<UserTokenResultDTO> getorgs(GovWxmpGetOrgsFormDTO formDTO);
+    Result getorgs(GovWxmpGetOrgsFormDTO formDTO);
 
     /**
      * @param formDTO
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 f41e0b81d9..055d169e27 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
@@ -96,7 +96,7 @@ public class GovLoginServiceImpl implements GovLoginService {
      * @Date 2020/4/18 21:11
      **/
     @Override
-    public Result<UserTokenResultDTO> getorgs(GovWxmpGetOrgsFormDTO formDTO) {
+    public Result getorgs(GovWxmpGetOrgsFormDTO formDTO) {
         //1、根据手机号查询到用户信息
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile());
         if (!customerStaffResult.success()) {
@@ -106,7 +106,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         //2、验证码是否正确
         String rightSmsCode = captchaRedis.getSmsCode(formDTO);
         if (!formDTO.getSmsCode().equals(rightSmsCode)) {
-            return new Result<UserTokenResultDTO>().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
+            return new Result<>().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
         }
         //3、TODO返回组织树
         return new Result();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 7fdbb725e3..9d9e11a64c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -122,6 +122,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
     @Override
     public Result<CustomerStaffDTO> getCustomerStaffInfo(CustomerStaffFormDTO formDTO) {
         CustomerStaffDTO customerStaffDTO = baseDao.selectListCustomerStaffInfo(formDTO);
+        if (null == customerStaffDTO) {
+            logger.error(String.format("根据手机号查询用户异常,手机号:[%s],code[%s],msg[%s]", formDTO.getMobile(), EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode(), EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getMsg()));
+            return new Result().error(EpmetErrorCode.GOV_STAFF_NOT_EXISTS.getCode());
+        }
         //判断用户是否已被禁用
         if (null != customerStaffDTO && UserConstant.DISABLED.equals(customerStaffDTO.getEnableFlag())) {
             logger.error(String.format("根据手机号查询用户异常,手机号:[%s],客户id:[%s],code[%s],msg[%s]", formDTO.getMobile(), formDTO.getCustomerId(), EpmetErrorCode.GOV_STAFF_DISABLED.getCode(), EpmetErrorCode.GOV_STAFF_DISABLED.getMsg()));