From 038bed9dd31bed4bf39e26f6e4846a50312e3373 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 3 May 2016 16:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E6=9D=83=E9=99=90=E7=9A=84=E6=97=B6=E5=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/UsersController.java | 16 +++------- .../operate/web/facade/AccessPermissionFacade.java | 34 +++++++++++++++++++--- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index a3d389c..ab7447f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.constants.ConstantInterface; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.facade.AccessPermissionFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; @@ -51,6 +52,8 @@ public class UsersController extends BaseController { private RolePermissionMapsService rolePermissionMapsService; @Autowired private PermissionsService permissionsService; + @Autowired + private AccessPermissionFacade accessPermissionFacade; private static final String LYMS = "龙源美生"; @@ -88,17 +91,7 @@ public class UsersController extends BaseController { user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); - UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); - userOrganizationMapsQuery.setUserId(user.getId()); - userOrganizationMapsQuery.setYn(YnEnums.YES.getId()); - List userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery); - List organizations = null; - for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { - organizations = new ArrayList<>(); - organizations.add(organizationService.getOrganization(userOrganizationMaps.getOrgId())); - } - - user.setOrganizations(organizations); + user.setOrganizations(accessPermissionFacade.findAccessPerminssionByUserId(user.getId())); } FrontEndResult frontEndResult = new FrontEndResult(); @@ -106,7 +99,6 @@ public class UsersController extends BaseController { frontEndResult.setData(users); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); return frontEndResult; -// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java index 12f9bf0..969c03e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java @@ -6,8 +6,10 @@ import com.lyms.platform.common.enums.PermissionTypeEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.Assert; import com.lyms.platform.operate.web.request.AccessPermissionAddRequest; +import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Roles; import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.RolesService; import com.lyms.platform.permission.service.UserRoleMapsService; import com.lyms.platform.permission.service.UsersService; @@ -19,10 +21,7 @@ import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @@ -41,6 +40,8 @@ public class AccessPermissionFacade { private UserRoleMapsService userRoleMapsService; @Autowired private DataPermissionService dataPermissionService; + @Autowired + private OrganizationService organizationService; //修改访问权限 public BaseResponse updateAccessPermission(){ @@ -100,4 +101,29 @@ public class AccessPermissionFacade { dataPermissionService.addOrUpdatePermission(dataPermissionsModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功."); } + + public List findAccessPerminssionByUserId(Integer userId){ + Users users =usersService.getUsers(userId); + + Assert.notNull(users, "用户信息不存在."); + DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); + dataPermissionsModelQuery.setUserId(userId); + List data =dataPermissionService.queryPermission(dataPermissionsModelQuery); + List dataList =new ArrayList<>(); + if(CollectionUtils.isNotEmpty(data)){ + Set set = data.get(0).getData().keySet(); + Iterator it = set.iterator(); + while(it.hasNext()){ + String id = it.next(); + try { + Organization organization = organizationService.getOrganization(Integer.valueOf(id)); + if(null!=organization){ + dataList.add(organization); + } + }catch (Exception e){ + } + } + } + return dataList; + } } \ No newline at end of file -- 1.8.3.1