diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java index ebc665637327371a22ce75be5be32fdc10462f64..cc879f4b021e0c4287c2c6b15140ddc6f864693a 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java @@ -85,7 +85,8 @@ abstract class BaseAction extends StandardJaxrsAction { runtime.unitAllList.addAll(list); list.clear(); } - runtime.groupList = business.organization().group().listWithPerson(effectivePerson.getDistinguishedName()); + runtime.groupList = business.organization().group().listWithPersonReference( + ListTools.toList(effectivePerson.getDistinguishedName()), true, true, true); if(runtime.groupList!=null){ for(String item : runtime.groupList){ if(item.indexOf("@")>-1) { diff --git a/o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/BaseAction.java b/o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/BaseAction.java index 0f6328a0642fe033301f16467986838b7b73bcba..a20ea32303476d546a5bae15efca752e25ded853 100644 --- a/o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/BaseAction.java +++ b/o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/BaseAction.java @@ -203,7 +203,7 @@ abstract class BaseAction extends StandardJaxrsAction { return flag; } } - + protected String objectToString(Object object) { String str = ""; if (object instanceof Integer) { @@ -222,7 +222,7 @@ abstract class BaseAction extends StandardJaxrsAction { } return str; } - + protected Runtime runtime(EffectivePerson effectivePerson, Business business, View view, List filterList, Map parameter, Integer count, boolean isBundle) throws Exception { Runtime runtime = new Runtime(); @@ -258,7 +258,8 @@ abstract class BaseAction extends StandardJaxrsAction { runtime.unitAllList.addAll(list); list.clear(); } - runtime.groupList = business.organization().group().listWithPerson(effectivePerson.getDistinguishedName()); + runtime.groupList = business.organization().group().listWithPersonReference( + ListTools.toList(effectivePerson.getDistinguishedName()), true, true, true); if(runtime.groupList!=null){ for(String item : runtime.groupList){ if(item.indexOf("@")>-1) {