From cf8d22544fc3f6bedde45c3b318c9e2b891d00ce Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 11 May 2016 10:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/dao/UserRoleMapsMapper.java | 2 ++ .../permission/service/UserRoleMapsService.java | 2 +- .../service/impl/OrganizationServiceImpl.java | 3 +-- .../service/impl/UserRoleMapsServiceImpl.java | 4 ++- .../src/main/resources/mainOrm/UserRoleMaps.xml | 4 ++- .../operate/web/controller/UsersController.java | 31 ++++++++++++++++++++-- 6 files changed, 39 insertions(+), 7 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserRoleMapsMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserRoleMapsMapper.java index 833d8e1..234e513 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserRoleMapsMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserRoleMapsMapper.java @@ -21,4 +21,6 @@ public interface UserRoleMapsMapper { public List queryUserRoleList(UserRoleMapsQuery query); + List queryUserRoleName(Integer id); + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserRoleMapsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserRoleMapsService.java index 8ff41bc..59eacdc 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserRoleMapsService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserRoleMapsService.java @@ -19,5 +19,5 @@ public interface UserRoleMapsService { public List queryUserRoleMaps(UserRoleMapsQuery query); public List queryUserRoleList(UserRoleMapsQuery query); - + List queryUserRoleName(Integer id); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java index d95e5f5..aaa458c 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java @@ -37,7 +37,7 @@ public class OrganizationServiceImpl implements OrganizationService { public Organization getOrganization(Integer id) { Organization organization = organizationMapper.getOrganization(id); if(null != organization) { - //设置机构类型 0 公司 1 医院 + //锟斤拷锟矫伙拷锟斤拷锟斤拷锟斤拷 0 锟斤拷司 1 医院 if( null != organization.getType() && (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) || organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) { @@ -63,7 +63,6 @@ public class OrganizationServiceImpl implements OrganizationService { if(CollectionUtils.isNotEmpty(organizations)) { for(Organization organization : organizations) { if(null != organization) { - //设置机构类型 0 公司 1 医院 if( null != organization.getType() && (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) || organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) { diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserRoleMapsServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserRoleMapsServiceImpl.java index 73592f9..71d3a94 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserRoleMapsServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserRoleMapsServiceImpl.java @@ -49,5 +49,7 @@ public class UserRoleMapsServiceImpl implements UserRoleMapsService { } return userRoleMapsMapper.queryUserRoleMaps(query); } - + public List queryUserRoleName(Integer id){ + return userRoleMapsMapper.queryUserRoleName(id); + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/UserRoleMaps.xml b/platform-biz-service/src/main/resources/mainOrm/UserRoleMaps.xml index c4df1e1..2503488 100644 --- a/platform-biz-service/src/main/resources/mainOrm/UserRoleMaps.xml +++ b/platform-biz-service/src/main/resources/mainOrm/UserRoleMaps.xml @@ -100,6 +100,8 @@ select count(1) from user_role_maps - + \ No newline at end of file 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 d8a0f02..586649c 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 @@ -61,6 +61,8 @@ public class UsersController extends BaseController { private static final String LYMS = "榫欐簮缇庣敓"; + private static final String ADMIN="绠＄悊鍛"; + /** @@ -525,7 +527,15 @@ public class UsersController extends BaseController { return; } - + //鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴峰垽鏂槸鍚 鏈夌鐞嗗憳鐨勬潈闄 + List list = userRoleMapsService.queryUserRoleName(loginState.getId()); + if(CollectionUtils.isEmpty(list) ||!list.contains(ADMIN)){ + Map map = new HashMap<>(); + map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); + map.put(ResultUtils.ERROR_MSG, "浣犳病鏈夎冻澶熺殑鏉冮檺."); + writeJson(response, JsonUtil.obj2JsonString(map)); + return; + } if (user != null) { //妫鏌ユ敞鍐岃处鎴锋槸鍚﹀瓨鍦 @@ -630,7 +640,15 @@ public class UsersController extends BaseController { ResultUtils.buildParameterErrorResultAndWrite(response, "deptId or ksId required"); return; } - + //鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴峰垽鏂槸鍚 鏈夌鐞嗗憳鐨勬潈闄 + List list = userRoleMapsService.queryUserRoleName(loginState.getId()); + if(CollectionUtils.isEmpty(list) ||!list.contains(ADMIN)){ + Map map = new HashMap<>(); + map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); + map.put(ResultUtils.ERROR_MSG, "浣犳病鏈夎冻澶熺殑鏉冮檺."); + writeJson(response, JsonUtil.obj2JsonString(map)); + return; + } if (user != null) { //妫鏌ユ敞鍐岃处鎴锋槸鍚﹀瓨鍦 @@ -824,6 +842,15 @@ public class UsersController extends BaseController { if (user != null) { Users users = usersService.getUsers(id); + //鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴峰垽鏂槸鍚 鏈夌鐞嗗憳鐨勬潈闄 + List list = userRoleMapsService.queryUserRoleName(loginState.getId()); + if(CollectionUtils.isEmpty(list) ||!list.contains(ADMIN)){ + Map map = new HashMap<>(); + map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); + map.put(ResultUtils.ERROR_MSG, "浣犳病鏈夎冻澶熺殑鏉冮檺."); + writeJson(response, JsonUtil.obj2JsonString(map)); + return; + } if(null == users) { Map map = new HashMap<>(); map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); -- 1.8.3.1