fix: saveOrUpdate逻辑优化，支持查询数据库中的记录，设置主键错误

myoss · myoss · commit f836f7b87bba · 2021-04-23T10:38:45.000+08:00
diff --git a/src/main/java/app/myoss/cloud/mybatis/repository/service/impl/BaseCrudServiceImpl.java b/src/main/java/app/myoss/cloud/mybatis/repository/service/impl/BaseCrudServiceImpl.java
@@ -659,7 +659,7 @@ public <I> Result<I> saveOrUpdate(T record, Object optionParam) {
             }
             T exist = exists.get(0);
             if (exist != null) {
-                primaryKeyValue = getPrimaryKeyValue(record, result);
+                primaryKeyValue = getPrimaryKeyValue(exist, result);
                 setPrimaryKeyValue(record, primaryKeyValue.getValue());
                 Result<Boolean> updateResult = updateByPrimaryKey(record, optionParam);
                 result.setSuccess(updateResult.isSuccess())

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ public <I> Result<I> saveOrUpdate(T record, Object optionParam) {`
`659`	`659`	`}`
`660`	`660`	`T exist = exists.get(0);`
`661`	`661`	`if (exist != null) {`
`662`		`- primaryKeyValue = getPrimaryKeyValue(record, result);`
	`662`	`+ primaryKeyValue = getPrimaryKeyValue(exist, result);`
`663`	`663`	`setPrimaryKeyValue(record, primaryKeyValue.getValue());`
`664`	`664`	`Result<Boolean> updateResult = updateByPrimaryKey(record, optionParam);`
`665`	`665`	`result.setSuccess(updateResult.isSuccess())`