Merge branches 'dev' and 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.22
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.23
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

epmet-module/gov-project/gov-project-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">
-    <version>0.3.22</version>
+    <version>0.3.23</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml

@@ -43,6 +43,7 @@
             project_process
         WHERE
             project_id = #{projectId}
+            AND public_reply != "" AND public_reply is not null
             AND del_flag = 0
             ORDER BY created_time DESC
     </select>

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.52
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.53
     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.52</version>
+    <version>0.3.53</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@@ -28,7 +28,7 @@
             <if test='null != province and "" != province '>
                 PROVINCE = #{province},
             </if>
-            <if test='null != sex and "" != sex '>
+            <if test='null != sex'>
                 SEX = #{sex},
             </if>
                 UPDATED_BY = #{updatedBy},