From 8e9a451b9d5fe64e16fe23067879693d4a515fa2 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 27 Jul 2016 14:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/permission/model/Roles.java | 18 ++++++++++ .../lyms/platform/permission/model/RolesQuery.java | 18 ++++++++++ .../src/main/resources/mainOrm/Roles.xml | 9 ++++- .../operate/web/controller/RolesController.java | 40 ++++++++++++++++------ 4 files changed, 74 insertions(+), 11 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java index 39990ff..b57a244 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java @@ -17,6 +17,24 @@ public class Roles { private String shortCode; private String hospitalid; private Integer permissiontype; + private Integer orgId; + private String orgName; + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public Integer getOrgId() { + return orgId; + } + + public void setOrgId(Integer orgId) { + this.orgId = orgId; + } private List permissions; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java index 8a05221..5428ed3 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java @@ -4,6 +4,7 @@ package com.lyms.platform.permission.model; import com.lyms.platform.common.dao.BaseQuery; import java.util.Date; +import java.util.List; public class RolesQuery extends BaseQuery { @@ -18,6 +19,23 @@ public class RolesQuery extends BaseQuery { private Date created; private String remarks; private String shortCode; + private List orgIds; + + public List getOrgIds() { + return orgIds; + } + + public void setOrgIds(List orgIds) { + this.orgIds = orgIds; + } + + public String getShortCode() { + return shortCode; + } + + public void setShortCode(String shortCode) { + this.shortCode = shortCode; + } private String keyword; diff --git a/platform-biz-service/src/main/resources/mainOrm/Roles.xml b/platform-biz-service/src/main/resources/mainOrm/Roles.xml index 5425f79..52f5b15 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Roles.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Roles.xml @@ -14,12 +14,13 @@ + SELECT LAST_INSERT_ID() -insert into roles (type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode) values (#{type},#{name},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{shortCode}) +insert into roles (type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,orgid) values (#{type},#{name},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{shortCode},#{orgid}) @@ -121,6 +122,12 @@ select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,s and shortCode = #{shortCode,jdbcType=VARCHAR} + + and orgId in + + #{item} + + and name like CONCAT(#{keyword}, '%') diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index afa1960..8d55f70 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -13,6 +13,7 @@ import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -45,7 +47,8 @@ public class RolesController extends BaseController { private PermissionsService permissionsService; @Autowired private UserRoleMapsService userRoleMapsService; - + @Autowired + private OrganizationService organizationService; /** * 管理员角色权限配置 @@ -137,7 +140,8 @@ public class RolesController extends BaseController { @RequestParam(value = "name") String name, @RequestParam(value = "enable", required = false) Integer enable, @RequestParam(value = "remarks", required = false) String remarks, - @RequestParam(value = "shortCode", required = false) String shortCode) { + @RequestParam(value = "shortCode", required = false) String shortCode, + @RequestParam(value = "orgId") Integer orgId) { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); @@ -161,6 +165,7 @@ public class RolesController extends BaseController { roles.setName(name); roles.setEnable(enable); roles.setRemarks(remarks); + roles.setOrgId(orgId); roles.setShortcode(shortCode); roles.setYn(YnEnums.YES.getId()); roles.setPublishId(users.getId()); @@ -241,13 +246,13 @@ public class RolesController extends BaseController { return; } //如果是禁用，再判断状态是否一样 - if ("2".equals(enable+"")&&!enable.equals(roles.getEnable())){ + if ("2".equals(enable + "") && !enable.equals(roles.getEnable())) { //如果有数据不能删除 UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); userRoleMapsQuery.setRoleId(id); userRoleMapsQuery.setYn(YnEnums.YES.getId()); Integer count = userRoleMapsService.queryUserRoleMapsCount(userRoleMapsQuery); - if(count > 0) { + if (count > 0) { ResultUtils.buildParameterErrorResultAndWrite(response, "该角色下有用户数据，不能禁用"); return; } @@ -290,7 +295,7 @@ public class RolesController extends BaseController { userRoleMapsQuery.setRoleId(id); userRoleMapsQuery.setYn(YnEnums.YES.getId()); Integer count = userRoleMapsService.queryUserRoleMapsCount(userRoleMapsQuery); - if(count > 0) { + if (count > 0) { ResultUtils.buildParameterErrorResultAndWrite(response, "该角色下有用户数据，不能删除"); return; } @@ -344,13 +349,13 @@ public class RolesController extends BaseController { UserRoleMapsQuery roleMapsQuery = new UserRoleMapsQuery(); roleMapsQuery.setYn(YnEnums.YES.getId()); roleMapsQuery.setRoleId(roles.getId()); - if(0 < userRoleMapsService.queryUserRoleMapsCount(roleMapsQuery)) { + if (0 < userRoleMapsService.queryUserRoleMapsCount(roleMapsQuery)) { ResultUtils.buildParameterErrorResultAndWrite(response, "角色下有用户信息，不能禁用！"); return; } //修改字段 - if(null != flag && (1 == flag || 2 == flag)) { + if (null != flag && (1 == flag || 2 == flag)) { roles.setEnable(flag); roles.setModified(new Date()); rolesService.updateRoles(roles); @@ -369,7 +374,7 @@ public class RolesController extends BaseController { @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "orgId", required = false) Integer orgId, + @RequestParam(value = "orgIds", required = false) String orgIds, @RequestParam(value = "enable", required = false) Integer enable) { limit = limit == null ? 10 : limit; @@ -384,7 +389,14 @@ public class RolesController extends BaseController { rolesQuery.setPage(page); rolesQuery.setLimit(limit); rolesQuery.setEnable(enable); - + List list =new ArrayList(); + if(StringUtils.isNotEmpty(orgIds)){ + String[] as =orgIds.split(","); + for(String a :as){ + list.add(Integer.valueOf(a)); + } + } + rolesQuery.setOrgIds(list); List roles = rolesService.queryRoles(rolesQuery); if (CollectionUtils.isNotEmpty(roles)) { @@ -405,6 +417,14 @@ public class RolesController extends BaseController { } */ roles1.setPermissions(permissionses); + String name = ""; + if (null != roles1.getOrgId()) { + Organization o = organizationService.getOrganization(roles1.getOrgId()); + if(null!=o){ + name = o.getName(); + } + } + roles1.setOrgName(name); } } @@ -460,7 +480,7 @@ public class RolesController extends BaseController { if (permissions.getYn().equals(YnEnums.NO.getId())) continue; permissionses.add(permissions); }*/ - permissionses= permissionsService.queryPermissionByRoleIds1(roles1.getId()); + permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId()); roles1.setPermissions(permissionses); } -- 1.8.3.1