From ea528303a9515f503304cedb9f69e92d51404cd1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 10 Jun 2020 18:28:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=BF=E5=BA=9C=E7=AB=AF?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B0=86=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=BA=BA=E5=91=98=E6=89=80=E5=B1=9E=E6=9C=BA=E5=85=B3?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8Did(agencyId)=E5=AD=98=E5=85=A5redis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/GovLoginServiceImpl.java   | 7 ++++---
 .../com/epmet/commons/tools/security/dto/GovTokenDto.java  | 5 +++++
 2 files changed, 9 insertions(+), 3 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 313c3b3bde..b1ad1b2908 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
@@ -168,7 +168,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         govTokenDto.setToken(token);
         govTokenDto.setUpdateTime(System.currentTimeMillis());
         govTokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
-        govTokenDto.setAgencyId(staffLatestAgency.getAgencyId());
+        govTokenDto.setRootAgencyId(staffLatestAgency.getAgencyId());
         govTokenDto.setCustomerId(staffLatestAgency.getCustomerId());
 
         //设置部门，网格，角色列表
@@ -176,6 +176,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         govTokenDto.setGridIdList(getGridIdList(staffLatestAgency.getStaffId()));
         CustomerAgencyDTO agency = getAgencyByStaffId(staffLatestAgency.getStaffId());
         if (agency != null) {
+            govTokenDto.setAgencyId(agency.getId());
             govTokenDto.setRoleList(queryGovStaffRoles(staffLatestAgency.getStaffId(), agency.getId()));
         }
         govTokenDto.setOrgIdPath(getOrgIdPath(staffLatestAgency.getStaffId()));
@@ -346,7 +347,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         govTokenDto.setToken(token);
         govTokenDto.setUpdateTime(System.currentTimeMillis());
         govTokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
-        govTokenDto.setAgencyId(orgId);
+        govTokenDto.setRootAgencyId(orgId);
         govTokenDto.setCustomerId(customerId);
 
         //设置部门，网格，角色列表
@@ -354,10 +355,10 @@ public class GovLoginServiceImpl implements GovLoginService {
         govTokenDto.setGridIdList(getGridIdList(staffId));
         CustomerAgencyDTO agency = getAgencyByStaffId(staffId);
         if (agency != null) {
+            govTokenDto.setAgencyId(agency.getId());
             govTokenDto.setRoleList(queryGovStaffRoles(staffId, agency.getId()));
         }
         govTokenDto.setOrgIdPath(getOrgIdPath(staffId));
-
         cpUserDetailRedis.set(govTokenDto, expire);
         logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss"));
     }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java
index 8bd8d5719f..c0fe871d08 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java
@@ -49,6 +49,11 @@ public class GovTokenDto extends BaseTokenDto implements Serializable {
     /**
      * 当前登录的组织id(顶级)
      */
+    private String rootAgencyId;
+
+    /**
+     * 当前用户所属的机关单位id
+     */
     private String agencyId;
 
     /**