Merge branch 'master' of https://github.com/youseries/ureport

lynchlee · Apr 17, 2018 · 9c13d92 · 9c13d92
2 parents faa1df0 + a3061b9
commit 9c13d92
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/ureport2-core/src/main/java/com/bstek/ureport/Utils.java b/ureport2-core/src/main/java/com/bstek/ureport/Utils.java
@@ -159,6 +159,7 @@ private static List<Cell> fetchCellsByTopParent(Context context,Cell cell,String
 	}
 
 	public static Object getProperty(Object obj,String property){
+		if(obj==null)return null;
 		try{
 			if(obj instanceof Map && property.indexOf(".")==-1){
 				Map<?,?> map=(Map<?,?>)obj;