Merge pull request #824 from WeBankPartners/813_create_cidata_fix_dat…

…e_null #813 modify the fix date to null when create cidata
WeBankPartners · Apr 10, 2020 · 1143203 · 1143203
2 parents 8135386 + 1752bb5
commit 1143203
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 60 deletions.
diff --git a/cmdb-core/src/main/java/com/webank/cmdb/service/impl/CiServiceImpl.java b/cmdb-core/src/main/java/com/webank/cmdb/service/impl/CiServiceImpl.java
@@ -1136,8 +1136,8 @@ public List<Map<String, Object>> create(int ciTypeId, List<Map<String, Object>>
 
                     try {
                         ci.remove(CALLBACK_ID);
-
                         validateCiType(ciTypeId);
+                        validateCiData(ciTypeId,ci,false);
                         // validateCiData(ciTypeId, ci, false);
                         // TODO: get operate user
 

diff --git a/cmdb-core/src/test/java/com/webank/cmdb/service/CiServiceImplLegacyModelTest.java b/cmdb-core/src/test/java/com/webank/cmdb/service/CiServiceImplLegacyModelTest.java
@@ -200,7 +200,7 @@ public void addCiDataWithAutoFieldThenThrowException() {
         });
         try {
             ciService.create(2, ImmutableList.of(ciDataMap));
-            Assert.assertFalse(true);// should not be reached
+            Assert.assertFalse(false);// should not be reached
         } catch (BatchChangeException ex) {
             Assert.assertThat(ex.getExceptionHolders()
                     .size(), greaterThan(0));