From 142dead6b2cc828f4e037f85e90f66770a7b9d1f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 21 Apr 2020 18:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E7=BB=87=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=A6=96=E9=A1=B5=E5=85=A5=E5=8F=82Dto?=
 =?UTF-8?q?=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/dto/form/GovWxmpEnteOrgFormDTO.java   | 2 +-
 .../main/java/com/epmet/service/impl/GovLoginServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/GovWxmpEnteOrgFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/GovWxmpEnteOrgFormDTO.java
index 8655268c8e..42920853ee 100644
--- a/epmet-auth/src/main/java/com/epmet/dto/form/GovWxmpEnteOrgFormDTO.java
+++ b/epmet-auth/src/main/java/com/epmet/dto/form/GovWxmpEnteOrgFormDTO.java
@@ -34,6 +34,6 @@ public class GovWxmpEnteOrgFormDTO implements Serializable {
      * 选择的要进入的组织(根组织id)
      */
     @NotBlank(message = "组织id不能为空")
-    private String orgId;
+    private String agencyId;
 }
 
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 c9b5d05ac2..75cf5d7300 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
@@ -195,7 +195,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         //1、获取用户token
         String token = this.generateGovWxmpToken(customerStaff.getUserId());
         //2、保存到redis
-        this.saveGovTokenDto(formDTO.getOrgId(), formDTO.getCustomerId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token);
+        this.saveGovTokenDto(formDTO.getAgencyId(), formDTO.getCustomerId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token);
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
         userTokenResultDTO.setToken(token);
         return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
@@ -208,7 +208,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         staffLoginAgencyRecordFormDTO.setStaffId(staffId);
         staffLoginAgencyRecordFormDTO.setWxOpenId(openId);
         staffLoginAgencyRecordFormDTO.setMobile(formDTO.getMobile());
-        staffLoginAgencyRecordFormDTO.setAgencyId(formDTO.getOrgId());
+        staffLoginAgencyRecordFormDTO.setAgencyId(formDTO.getAgencyId());
         Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginAgencyRecordFormDTO);
         return staffLoginRecordResult;
     }