Browse Source

setColumns 添加 modifyFlag 支持

James 3 years ago
parent
commit
803b3e9cfd
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/main/java/com/jfinal/plugin/activerecord/Record.java

+ 5 - 5
src/main/java/com/jfinal/plugin/activerecord/Record.java

@@ -109,7 +109,9 @@ public class Record implements IRow<Record>, Serializable {
 	 * @param columns the columns map
 	 * @param columns the columns map
 	 */
 	 */
 	public Record setColumns(Map<String, Object> columns) {
 	public Record setColumns(Map<String, Object> columns) {
-		this.getColumns().putAll(columns);
+		for (Entry<String, Object> e : columns.entrySet()) {
+			set(e.getKey(), e.getValue());
+		}
 		return this;
 		return this;
 	}
 	}
 	
 	
@@ -118,8 +120,7 @@ public class Record implements IRow<Record>, Serializable {
 	 * @param record the Record object
 	 * @param record the Record object
 	 */
 	 */
 	public Record setColumns(Record record) {
 	public Record setColumns(Record record) {
-		getColumns().putAll(record.getColumns());
-		return this;
+		return setColumns(record.getColumns());
 	}
 	}
 	
 	
 	/**
 	/**
@@ -127,8 +128,7 @@ public class Record implements IRow<Record>, Serializable {
 	 * @param model the Model object
 	 * @param model the Model object
 	 */
 	 */
 	public Record setColumns(Model<?> model) {
 	public Record setColumns(Model<?> model) {
-		getColumns().putAll(model._getAttrs());
-		return this;
+		return setColumns(model._getAttrs());
 	}
 	}
 	
 	
 	/**
 	/**