Skip to content

Commit 1d1e133

Browse files
committed
fix: 修复更新excludes可能无法生效问题
1 parent 081174a commit 1d1e133

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/mapping/defaults/DefaultUpdate.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,12 @@ protected UpdateResultOperator doExecute() {
8888
.getColumnByName(entry.getKey())
8989
.map(RDBColumnMetadata::getName)
9090
.orElse(entry.getKey());
91-
operator.set(column, entry.getValue());
91+
if (excludes.contains(column)) {
92+
//忽略修改
93+
operator.set(column, null);
94+
} else {
95+
operator.set(column, entry.getValue());
96+
}
9297
}
9398
}
9499
return operator

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/operator/dml/update/NativeSqlUpdateColumn.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.hswebframework.ezorm.rdb.operator.dml.update;
22

3+
import lombok.EqualsAndHashCode;
34
import lombok.Getter;
45
import lombok.Setter;
56
import org.hswebframework.ezorm.rdb.operator.builder.fragments.NativeSql;
67

78
@Getter
89
@Setter
10+
@EqualsAndHashCode(callSuper = true, exclude = {"sql", "parameters"})
911
public class NativeSqlUpdateColumn extends UpdateColumn implements NativeSql {
1012

1113
private String sql;

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/operator/dml/update/UpdateOperator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public UpdateOperator set(Map<String, Object> values) {
4141

4242
public abstract UpdateOperator set(String column, Object value);
4343
public abstract UpdateOperator set(UpdateColumn column);
44+
45+
@Deprecated
4446
public abstract UpdateOperator set(Object entity);
4547

4648
public abstract UpdateOperator where(Consumer<Conditional<?>> dsl);

0 commit comments

Comments
 (0)