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

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-dev
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.16
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.17
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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.16</version>
+    <version>0.3.17</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-oss</artifactId>

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.62
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.63
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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.62</version>
+    <version>0.3.63</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -771,11 +771,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
 
         //4:根据不同角色查询不同数据
         CustomerAgencyEntity agencyEntity = baseDao.selectById(staffAgencyDTO.getAgencyId());
+        if (party) {
+            //4.1:查询当前机关的网格列表以及所有下级机关的网格列表
             //当前机关信息
             returnDTO.setAgencyId(agencyEntity.getId());
             returnDTO.setAgencyName(agencyEntity.getOrganizationName());
-        if (party) {
-            //4.1:查询当前机关的网格列表以及所有下级机关的网格列表
             //当前机关下部门列表信息
             List<AgencyDeptList> agencyDeptList = customerDepartmentDao.selectAgencyDeptMsgList(agencyEntity.getId());
             returnDTO.setAgencyDeptList(agencyDeptList);

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.11
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.14
     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.11</version>
+    <version>0.3.14</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>