Merge remote-tracking branch 'origin/dev_voice' into dev_voice

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

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.31
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.32
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.31</version>
+    <version>0.3.32</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>