From 2b7d44b2316339334bffae0214dee6068f18572e Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 1 Jul 2021 08:52:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B0=86?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=840.0.14=20flyway=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=94=B9=E4=B8=BAselect=200;=E8=B7=B3=E8=BF=87=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.14__alter_project_location.sql | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql index 02284815d2..7a51a3f595 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql @@ -1,6 +1 @@ -ALTER TABLE `project` -ADD COLUMN `LOCATE_ADDRESS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]' AFTER `ORG_ID_PATH`, -ADD COLUMN `LOCATE_LONGITUDE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位经度' AFTER `LOCATE_ADDRESS`, -ADD COLUMN `LOCATE_DIMENSION` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位维度' AFTER `LOCATE_LONGITUDE`; - - +select 0; \ No newline at end of file From 8c66070b638be39e70cb64b408c9ac8083ce7e2f Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 1 Jul 2021 09:04:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=9A=E6=97=A0?= =?UTF-8?q?=E6=95=88=E7=9A=84flyway=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.14__alter_project_location.sql | 1 - .../src/main/resources/db/migration/V0.0.15__update_project.sql | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql deleted file mode 100644 index 7a51a3f595..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql +++ /dev/null @@ -1 +0,0 @@ -select 0; \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql deleted file mode 100644 index 66e3aed7a3..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql +++ /dev/null @@ -1,2 +0,0 @@ -update project set locate_address = NULL,locate_longitude = NULL,locate_dimension = NULL; - From 47846732842de2cd01b2d2f2bf2ad4afad3db66f Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 1 Jul 2021 10:58:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9AFieldMetaObject#?= =?UTF-8?q?getCustomerId=E6=96=B9=E6=B3=95=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/mybatis/handler/FieldMetaObjectHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java index 616d1b10c5..de796f3760 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java @@ -104,7 +104,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { Object customerId; customerId = getFieldValByName(FieldConstant.CUSTOMER_ID_HUMP, metaObject); - if (customerId != null) { + if (customerId != null && !customerId.equals("")) { // 看entity是否手动设置了，设置了就用设置的 return customerId; }