From 0c681257d3833dd97980153c77d1a1ef84962b2d Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 17 Sep 2020 20:04:37 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-38917=20=E6=A8=A1=E6=9D=BF=E7=9F=AD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=86=85=E7=9A=84=E4=BF=9D=E5=AD=98=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=B9=E5=BA=94=E5=A4=9A=E4=B8=AAUUID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 5 ++++- .../java/com/fr/design/data/DesignTableDataManagerTest.java | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index da2f0e0dc..6f1c94eee 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -1472,7 +1472,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } public String getUUID() { - return StringUtils.isEmpty(uuid) ? UUID.randomUUID().toString() : uuid; + if (StringUtils.isEmpty(uuid)) { + uuid = UUID.randomUUID().toString(); + } + return uuid; } public int getActiveKeyStatus() { diff --git a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java index 0e32f7e2d..9a5ce7b8c 100644 --- a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java +++ b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java @@ -155,7 +155,4 @@ public class DesignTableDataManagerTest { DesignTableDataManager.addDsColumnNames("ds1", new String[]{"a", "b", "c"}); Assert.assertEquals(columnNames, DesignTableDataManager.getDsColumnNames("ds1")); } - - public void testFireDsChanged() { - } }