修改政府端登录接口，将工作人员所属机关单位id(agencyId)存入redis

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"));
     }

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;
 
     /**