修改: 1.重置密码修改 2.合伙人登录校验公司模块权限

@@ -284,7 +284,7 @@ func CenterCompanys(header *protocol.RequestHeader, request *protocolx.CenterCom
 	}()
 	}()
 	loginSvr.Init(request.Phone)
 	loginSvr.Init(request.Phone)
 	if len(loginSvr.Users) == 0 && len(loginSvr.PartnerInfo) == 0 {
 	if len(loginSvr.Users) == 0 && len(loginSvr.PartnerInfo) == 0 {
-		err = protocol.NewErrWithMessage(502, err) //账号不存在
+		err = protocol.NewErrWithMessage(10008)
 		return
 		return
 	}
 	}
 	switch request.GrantType {
 	switch request.GrantType {
@@ -409,6 +409,17 @@ func LoginV2(header *protocol.RequestHeader, request *protocol.LoginRequestV2) (
 				return
 				return
 			}
 			}
 		}
 		}
+		//TODO:验证公司模块权限
+		if _, adminUsers, e := UsersRepository.Find(map[string]interface{}{"inCompanyIds": []int64{int64(request.Cid)}, "adminType": 2}); e == nil {
+			if len(adminUsers) > 0 {
+				au := adminUsers[0]
+				if code, e := adminApiGateway.UserAuth(au.Id, constant.BUSINESS_ADMIN_PLATFORM_ID); e != nil || code != 0 {
+					log.Debug("【合伙人检查权限】", claim.Phone, "【公司】", request.Cid, au.Id, code, e.Error())
+					err = protocol.NewErrWithMessage(10008, err) // 抱歉，企业管理员未帮您开通权限
+					return
+				}
+			}
+		}
 		break
 		break
 	case int(protocolx.AdminTypeManager):
 	case int(protocolx.AdminTypeManager):
 		if p, e := UsersRepository.FindOne(map[string]interface{}{"phone": claim.Phone, "companyId": request.Cid}); e == nil {
 		if p, e := UsersRepository.FindOne(map[string]interface{}{"phone": claim.Phone, "companyId": request.Cid}); e == nil {

@@ -159,7 +159,7 @@ func ResetPassword(header *protocol.RequestHeader, request *protocol.ResetPasswo
 	defer func() {
 	defer func() {
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
-	if err = UserAuthService.ResetUserPassword(header.UserId, fmt.Sprintf("%v", header.SimNum), request.NewPwd); err != nil {
+	if err = UserAuthService.ResetUserPassword(header.UserId, request.Phone, request.NewPwd); err != nil {
 		err = protocol.NewCustomMessage(1, err.Error())
 		err = protocol.NewCustomMessage(1, err.Error())
 		return
 		return
 	}
 	}