From 4710dea4e340f63e569c841d49fd8c6dd0ecf494 Mon Sep 17 00:00:00 2001 From: hanshaofeng Date: Tue, 29 Nov 2016 14:44:40 +0800 Subject: [PATCH] add extends BaseModel --- .../com/lyms/platform/operate/web/facade/AutoMatchFacade.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java index d912846..9988dfc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java @@ -60,7 +60,15 @@ public class AutoMatchFacade { /**/ //用户角色 if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType())||UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())) { - data.add(list.get(0).getOrgId()); + List list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId())); + if(CollectionUtils.isNotEmpty(list2)){ + for(Organization organization:list2){ + data.add(organization.getId()); + } + } + if (!data.contains(list.get(0).getOrgId())) { + data.add(list.get(0).getOrgId()); + } } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(list.get(0).getType())) { return null; } -- 1.8.3.1