提交 e23c2007 编写于 作者: hebao@lab.ibiz5.com's avatar hebao@lab.ibiz5.com

获取子数据时不进行排重及排空操作,返回全部数据;相关bug修复

上级 aa74d522
...@@ -247,7 +247,7 @@ public class EntityModel { ...@@ -247,7 +247,7 @@ public class EntityModel {
List<Setting> settings=JSONArray.parseArray(this.getEntity().getExtParams(),Setting.class); List<Setting> settings=JSONArray.parseArray(this.getEntity().getExtParams(),Setting.class);
for(Setting setting:settings) for(Setting setting:settings)
{ {
if(key.equals(setting.getValue())) if(key.equals(setting.getProperty()))
{ {
return setting.getValue(); return setting.getValue();
} }
......
...@@ -291,7 +291,7 @@ public class ModelObj extends DataObj<String,Object> { ...@@ -291,7 +291,7 @@ public class ModelObj extends DataObj<String,Object> {
property=this.getDataModel().findObjectProperty(name,"DOWN"); property=this.getDataModel().findObjectProperty(name,"DOWN");
if(property!=null) if(property!=null)
{ {
return this.getNested(property.getOwnerDataModel().getDataModelName()).get(column); return this.getNested(property.getOwnerDataModel().getDataModelName()).get(key);
} }
if(this.getParent()!=null) if(this.getParent()!=null)
......
...@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; ...@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List;
public class NestedArray extends ArrayList<ModelObj> { public class NestedArray extends ArrayList<ModelObj> {
...@@ -65,9 +66,9 @@ public class NestedArray extends ArrayList<ModelObj> { ...@@ -65,9 +66,9 @@ public class NestedArray extends ArrayList<ModelObj> {
return last; return last;
} }
public LinkedHashSet<Object> get(String key) public List<Object> get(String key)
{ {
LinkedHashSet<Object> list=new LinkedHashSet<>(); List<Object> list=new ArrayList<>();
if(key==null) if(key==null)
return null; return null;
...@@ -80,8 +81,7 @@ public class NestedArray extends ArrayList<ModelObj> { ...@@ -80,8 +81,7 @@ public class NestedArray extends ArrayList<ModelObj> {
String column=epair[1]; String column=epair[1];
this.forEach(modelObj -> { this.forEach(modelObj -> {
Object obj=modelObj.getEntity(name).get(column); Object obj=modelObj.getEntity(name).get(column);
if(obj!=null) list.add(obj);
list.add(obj);
}); });
} }
} }
...@@ -89,9 +89,9 @@ public class NestedArray extends ArrayList<ModelObj> { ...@@ -89,9 +89,9 @@ public class NestedArray extends ArrayList<ModelObj> {
} }
public LinkedHashSet<Object> get(String key,String cond) public List<Object> get(String key,String cond)
{ {
LinkedHashSet<Object> list=new LinkedHashSet<>(); List<Object> list=new ArrayList<>();
if(key==null) if(key==null)
return null; return null;
...@@ -106,8 +106,7 @@ public class NestedArray extends ArrayList<ModelObj> { ...@@ -106,8 +106,7 @@ public class NestedArray extends ArrayList<ModelObj> {
if(modelObj.IF(cond)) if(modelObj.IF(cond))
{ {
Object obj=modelObj.getEntity(name).get(column); Object obj=modelObj.getEntity(name).get(column);
if(obj!=null) list.add(obj);
list.add(obj);
} }
}); });
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册