From 5791a36be6b06c2c69282e260aeb2740eabd9011 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 29 May 2020 09:38:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E8=BF=87=E6=BB=A4=E6=B2=A1=E6=9C=89=E5=85=AC?= =?UTF-8?q?=E5=BC=80=E7=AD=94=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectProcessDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml index 7321e44aa5..42480dfd48 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml +++ b/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 != "" OR public_reply != null) AND del_flag = 0 ORDER BY created_time DESC From adbd1c2fd250f62cb5b9408797d822468b0f8731 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 29 May 2020 10:50:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E8=BF=87=E6=BB=A4=E6=B2=A1=E6=9C=89=E5=85=AC?= =?UTF-8?q?=E5=BC=80=E7=AD=94=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectProcessDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml index 42480dfd48..788b589863 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml @@ -43,7 +43,7 @@ project_process WHERE project_id = #{projectId} - AND (public_reply != "" OR public_reply != null) + AND public_reply != "" AND public_reply is not null AND del_flag = 0 ORDER BY created_time DESC From 8aee9a5554831b9cced4ef91066cd688e11ffbfa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 May 2020 11:00:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?130=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=9Agovproject=E5=A4=84=E7=90=86=E8=BF=9B=E5=B1=95?= =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E5=85=AC=E5=BC=80=E7=AD=94=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 1eaa3e42ca..d932cd9d9a 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/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 # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index aaa71aad08..71bae60b6a 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.22 + 0.3.23 gov-project com.epmet From 24e21beb068e3e57c2518c82bdc04b9e8326251c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 May 2020 13:28:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?updatewxuserinfo=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserWechatDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index 955dca114d..48786dc58a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -28,7 +28,7 @@ PROVINCE = #{province}, - + SEX = #{sex}, UPDATED_BY = #{updatedBy}, From b90d2a6501c58d5099dad507f89ce85303f368b3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 May 2020 13:30:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?130=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=9Aupdatewxuserinfo=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 5189eab056..8a1d84ff15 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/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 # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index bd4fd2282d..37dfbcf945 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.52 + 0.3.53 com.epmet epmet-user