tt/Aria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #632 from DaveBoy/aria

Browse Source 
修复关联分页逻辑空指针异常
This commit is contained in:
lyy
2020-03-04 13:45:17 +08:00
committed by GitHub
parent 54cbdb7ee0 370dca27ff
commit b90450f1cd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PublicComponent/src/main/java/com/arialyy/aria/orm/DelegateFind.java
View File

@@ -26,6 +26,7 @@ import com.arialyy.aria.util.ALog;
import com.arialyy.aria.util.CommonUtil; import com.arialyy.aria.util.CommonUtil;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -259,7 +260,9 @@ class DelegateFind extends AbsDelegate {
parents.put(pRowId, createParent(pRowId, parentClazz, pColumn, cursor)); parents.put(pRowId, createParent(pRowId, parentClazz, pColumn, cursor));
} }
if(paged){ if(paged){
childs.get(pRowId).addAll(createChildren(db,childClazz,pColumn,entityColumn,parentColumn,parents.get(pRowId))); List<C> list = createChildren(db, childClazz, pColumn, entityColumn, parentColumn, parents.get(pRowId));
if(list!=null)
childs.get(pRowId).addAll(list);
} }
else { else {
childs.get(pRowId).add(createChild(childClazz, cColumn, cursor)); childs.get(pRowId).add(createChild(childClazz, cColumn, cursor));
@@ -304,6 +307,9 @@ class DelegateFind extends AbsDelegate {
field.setAccessible(true); field.setAccessible(true);
if(field.getName().equals(parentColumn)){ if(field.getName().equals(parentColumn)){
Object o = field.get(parents); Object o = field.get(parents);
if(o instanceof String) {
o = URLEncoder.encode((String) o);
}
return findData(db,childClazz,entityColumn+"='"+o+"'"); return findData(db,childClazz,entityColumn+"='"+o+"'");
} }
} }