解决 @keysql GenId 覆盖已有 ID 的问题 fixed abel533#482

abel533 · abel533 · commit 2dafa13064bb · 2018-12-08T09:47:55.000+08:00
diff --git a/base/src/test/java/tk/mybatis/mapper/base/genid/InsertGenIdTest.java b/base/src/test/java/tk/mybatis/mapper/base/genid/InsertGenIdTest.java
@@ -87,6 +87,22 @@ public void testGenId(){
         }
     }
 
+    @Test
+    public void testGenIdWithExistsId(){
+        SqlSession sqlSession = getSqlSession();
+        try {
+            CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
+            Country country = new Country("test", "T");
+            country.setId(9999L);
+            Assert.assertEquals(1, mapper.insert(country));
+            Assert.assertNotNull(country.getId());
+            Assert.assertEquals(new Long(9999), country.getId());
+            System.out.println(country.getId());
+        } finally {
+            sqlSession.close();
+        }
+    }
+
 
     @Test
     public void testUUID(){
diff --git a/core/src/main/java/tk/mybatis/mapper/genid/GenIdUtil.java b/core/src/main/java/tk/mybatis/mapper/genid/GenIdUtil.java
@@ -68,10 +68,11 @@ public static void genId(Object target, String property, Class<? extends GenId>
                     LOCK.unlock();
                 }
             }
-            Object id = genId.genId(table, column);
-            //赋值
             MetaObject metaObject = MetaObjectUtil.forObject(target);
-            metaObject.setValue(property, id);
+            if (metaObject.getValue(property) == null) {
+                Object id = genId.genId(table, column);
+                metaObject.setValue(property, id);
+            }
         } catch (Exception e) {
             throw new MapperException("生成 ID 失败!", e);
         }

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,11 @@ public static void genId(Object target, String property, Class<? extends GenId>`
`68`	`68`	`LOCK.unlock();`
`69`	`69`	`}`
`70`	`70`	`}`
`71`		`- Object id = genId.genId(table, column);`
`72`		`- //赋值`
`73`	`71`	`MetaObject metaObject = MetaObjectUtil.forObject(target);`
`74`		`- metaObject.setValue(property, id);`
	`72`	`+ if (metaObject.getValue(property) == null) {`
	`73`	`+ Object id = genId.genId(table, column);`
	`74`	`+ metaObject.setValue(property, id);`
	`75`	`+ }`
`75`	`76`	`} catch (Exception e) {`
`76`	`77`	`throw new MapperException("生成 ID 失败!", e);`
`77`	`78`	`}`