浏览代码

_setAttrs、_setOrPut 添加 null 值判断

James 3 年之前
父节点
当前提交
de4d4641f2
共有 1 个文件被更改,包括 8 次插入4 次删除
  1. 8 4
      src/main/java/com/jfinal/plugin/activerecord/Model.java

+ 8 - 4
src/main/java/com/jfinal/plugin/activerecord/Model.java

@@ -158,8 +158,10 @@ public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	 * @return this Model
 	 */
 	public M _setAttrs(Map<String, Object> attrs) {
-		for (Entry<String, Object> e : attrs.entrySet()) {
-			set(e.getKey(), e.getValue());
+		if (attrs != null) {
+			for (Entry<String, Object> e : attrs.entrySet()) {
+				set(e.getKey(), e.getValue());
+			}
 		}
 		return (M)this;
 	}
@@ -274,8 +276,10 @@ public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	}
 	
 	public M _setOrPut(Map<String, Object> map) {
-		for (Entry<String, Object> e : map.entrySet()) {
-			setOrPut(e.getKey(), e.getValue());
+		if (map != null) {
+			for (Entry<String, Object> e : map.entrySet()) {
+				setOrPut(e.getKey(), e.getValue());
+			}
 		}
 		return (M)this;
 	}