Merge branch 'fix/视图查询当前人员群组未关联查询当前人员身份和组织的群组' into 'wrdp'

[数据中心]视图查询中当前人员群组未关联查询当前人员身份和组织的群组

See merge request o2oa/o2oa!2461

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) {

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<FilterEntry> filterList, Map<String, String> 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) {