From 102336b54ef9dc74ad19c7966df85adf37942bd1 Mon Sep 17 00:00:00 2001
From: o2sword <171715986@qq.com>
Date: Fri, 3 Jul 2020 15:10:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E7=BE=A4?=
 =?UTF-8?q?=E7=BB=84=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/x/base/core/project/organization/Group.java | 9 +++++++++
 .../assemble/express/jaxrs/group/BaseAction.java         | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/Group.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/Group.java
index 70fbdc84d5..50ba13a79e 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/Group.java
+++ b/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;
+	}
 }
diff --git a/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/group/BaseAction.java b/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/group/BaseAction.java
index 8244e155cc..2e784f29af 100644
--- a/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/group/BaseAction.java
+++ b/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;
 	}
 
-- 
GitLab