...

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/OrgController.java

@@ -248,7 +248,8 @@ public class OrgController extends ControllerSupport {
 	public PageInfo<OrgDomain> getSubOrgPage(@PathVariable Integer curPage,
 			@PathVariable Integer pageSize, @RequestParam(required = true) Long parentId,
 			@RequestParam(required = false) String code,
-			@RequestParam(required = false) String name) {
+			@RequestParam(required = false) String name,
+			@RequestParam(required = false) String propertyKeys) {
 
 		if (null == parentId) {
 			throw new StatusException("B-001249", "parentId is null");
@@ -279,6 +280,11 @@ public class OrgController extends ControllerSupport {
 		List<OrgDomain> list = Lists.newArrayList();
 		Iterator<OrgEntity> iterator = page.iterator();
 
+		List<String> propertyKeyList = null;
+		if (StringUtils.isNotBlank(propertyKeys)) {
+			propertyKeyList = RegExpUtil.findAll(propertyKeys, "\\w+");
+		}
+
 		while (iterator.hasNext()) {
 			OrgEntity next = iterator.next();
 			OrgDomain d = new OrgDomain();
@@ -295,6 +301,11 @@ public class OrgController extends ControllerSupport {
 			d.setTelephone(next.getTelephone());
 			d.setCreationTime(next.getCreationTime());
 			d.setUpdateTime(next.getUpdateTime());
+
+			if (CollectionUtils.isNotEmpty(propertyKeyList)) {
+				Map<String, String> properties = getProperties(d.getId(), propertyKeyList);
+				d.setProperties(properties);
+			}
 		}
 
 		PageInfo<OrgDomain> ret = new PageInfo<OrgDomain>();