From 708f036c79de5c5358105b3b7b2a0d2a140c7148 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Jul 2022 16:35:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=86=85=E5=AE=B9null?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ArticleDao.xml | 12 ++++++------ .../src/main/resources/mapper/DraftDao.xml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml index 875773b8c9..572bd59e84 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml @@ -25,8 +25,8 @@ SELECT dc.ID, - dc.CONTENT, + IFNULL(dc.CONTENT,'') CONTENT, dc.CONTENT_TYPE, - dc.FILE_NAME, + IFNULL(dc.FILE_NAME,'') FILE_NAME, dc.ORDER_NUM, (case when dc.AUDIT_STATUS is null then "" From 09ee9b9ebe4e70242f22e9aded7ce7fa7616ea17 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 7 Jul 2022 15:15:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.59__alter_ic_vaccine.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql new file mode 100644 index 0000000000..0c96934859 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql @@ -0,0 +1,6 @@ + +ALTER TABLE `ic_vaccine` +ADD COLUMN `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数字社区的icResiUserId、其他情况无值' AFTER `USER_TYPE`; + + + From 1292ae08b2e56dc630c1d68f47d8a681124f3370 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 7 Jul 2022 15:30:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8F=90=E9=94=99=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.59__alter_ic_vaccine.sql | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql deleted file mode 100644 index 0c96934859..0000000000 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.59__alter_ic_vaccine.sql +++ /dev/null @@ -1,6 +0,0 @@ - -ALTER TABLE `ic_vaccine` -ADD COLUMN `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数字社区的icResiUserId、其他情况无值' AFTER `USER_TYPE`; - - - From 0e61469278ce5bb75ce63ba947426975aa894789 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 8 Jul 2022 14:35:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=AE=B1=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=A1=A8=EF=BC=8C=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.12__alert_draft.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.12__alert_draft.sql diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.12__alert_draft.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.12__alert_draft.sql new file mode 100644 index 0000000000..9073b92eec --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.12__alert_draft.sql @@ -0,0 +1,3 @@ + +ALTER TABLE `draft_content` + MODIFY COLUMN `CONTENT` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容' AFTER `ARTICLE_ID`; From c21e2e46c022fcf263ec21aea7cc1b61bcb01e6b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 8 Jul 2022 14:36:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=AE=B1=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=A1=A8=EF=BC=8C=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.12__alert_draft.sql | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.12__alert_draft.sql diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.12__alert_draft.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.12__alert_draft.sql deleted file mode 100644 index 9073b92eec..0000000000 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.12__alert_draft.sql +++ /dev/null @@ -1,3 +0,0 @@ - -ALTER TABLE `draft_content` - MODIFY COLUMN `CONTENT` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容' AFTER `ARTICLE_ID`;