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

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -51,6 +51,12 @@
         <foreach item="id" collection="listStr" open="(" separator="," close=")" index="">
             #{id}
         </foreach>
+        ORDER BY field(
+            id,
+        <foreach item="id" collection="listStr" separator=",">
+            #{id}
+        </foreach>
+        )<!-- 按照foreach中遍历的Id顺序排序(按组织机构自上而下排序) -->
     </select>
 
     <select id="selectSubAgencyById" resultType="com.epmet.dto.result.SubListResultDTO">

epmet-module/resi-group/resi-group-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.15
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.16
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-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.15</version>
+    <version>0.3.16</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.14
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.15
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络

epmet-module/resi-partymember/resi-partymember-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.14</version>
+    <version>0.3.15</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -91,7 +91,7 @@
                 WHEN ( pi.confirm_result = 'approved' ) THEN 'manual'
             END AS certifyType,
             UNIX_TIMESTAMP(pi.created_time) AS applyTime,
-            organization_type AS extraOrganization,
+            IFNULL(extra_organization,'') AS extraOrganization,
             extra_certifier_name AS contactPeople,
             extra_certifier_mobile AS contactMobile,
             IFNULL(CONCAT(IFNULL(street,null),IFNULL(estate,null),IFNULL(building,null)),'') AS address

epmet-user/epmet-user-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.23
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-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.22</version>
+    <version>0.3.23</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>