Merge branch 'fix/群组查询部分接口缺少身份信息' into 'develop'

【人员组织】修复部分群组查询接口缺少身份信息的问题 to develop

See merge request o2oa/o2oa!1032

o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/Group.java

@@ -24,6 +24,8 @@ public class Group extends GsonPropertyObject {
 	private List<String> groupList = new ArrayList<>();
 	@FieldDescribe("组织成员")
 	private List<String> unitList = new ArrayList<>();
+	@FieldDescribe("身份成员")
+	private List<String> identityList = new ArrayList<>();
 
 	public String getName() {
 		return name;
@@ -89,4 +91,11 @@ public class Group extends GsonPropertyObject {
 		this.unitList = unitList;
 	}
 
+	public List<String> getIdentityList() {
+		return identityList;
+	}
+
+	public void setIdentityList(List<String> identityList) {
+		this.identityList = identityList;
+	}
 }

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/group/BaseAction.java

@@ -10,6 +10,7 @@ import com.x.base.core.project.tools.ListTools;
 import com.x.organization.assemble.express.Business;
 import com.x.organization.assemble.express.CacheFactory;
 import com.x.organization.core.entity.Group;
+import com.x.organization.core.entity.Identity;
 import com.x.organization.core.entity.Person;
 import com.x.organization.core.entity.Unit;
 
@@ -60,6 +61,12 @@ class BaseAction extends StandardJaxrsAction {
 				t.getUnitList().add(o.getDistinguishedName());
 			}
 		}
+		if (ListTools.isNotEmpty(group.getIdentityList())) {
+			for (String str : group.getIdentityList()) {
+				Identity o = business.identity().pick(str);
+				t.getIdentityList().add(o.getDistinguishedName());
+			}
+		}
 		return t;
 	}