ibps-provider-base-root/modules/provider-platform-api/src/main/java/com/lc/ibps/org/api/IPartyRoleService.java

@@ -5,7 +5,7 @@
  * 作者：lijs
  * 日期：2018年10月24日-上午9:10:27
  * 版权：广州流辰信息技术有限公司版权所有
- *
+ * 
  */
 package com.lc.ibps.org.api;
 
@@ -30,7 +30,7 @@ import com.lc.ibps.org.vo.IdKeyVo;
 
 
 
-/**
+/** 
  *
  *角色管理入口
  * <pre> 
@@ -45,13 +45,13 @@ import com.lc.ibps.org.vo.IdKeyVo;
 @RequestMapping(value = "/role")
 @RestController
 public interface IPartyRoleService {
-
+	
 	@RequestMapping(value = "/query", method = RequestMethod.POST)
 	public APIResult<APIPageList<PartyRolePo>> query(
 			@RequestBody(required = true) APIRequest request);
-
+	
 	/**
-	 *
+	 * 
 	 * 根据角色ID获取角色信息包含系统信息
 	 *
 	 * @param request
@@ -61,9 +61,9 @@ public interface IPartyRoleService {
 	@RequestMapping(value = "/queryWithSysByIds", method = RequestMethod.POST)
 	public APIResult<APIPageList<PartyRolePo>> queryWithSysByIds(
 			@RequestBody(required = true) APIRequest request);
-
+	
 	/**
-	 *
+	 * 
 	 * 查询组织角色以及父级组织的角色
 	 *
 	 * @param request
@@ -72,9 +72,9 @@ public interface IPartyRoleService {
 	@RequestMapping(value = "/queryByOrgId", method = RequestMethod.POST)
 	public APIResult<APIPageList<PartyRolePo>> queryByOrgId(
 			@RequestBody(required = true) APIRequest request);
-
+	
 	/**
-	 *
+	 * 
 	 * 查询组织角色以及父级组织的角色
 	 *
 	 * @param request
@@ -83,9 +83,9 @@ public interface IPartyRoleService {
 	@RequestMapping(value = "/queryByPositionId", method = RequestMethod.POST)
 	public APIResult<APIPageList<PartyRolePo>> queryByPositionId(
 			@RequestBody(required = true) APIRequest request);
-
+	
 	/**
-	 *
+	 * 
 	 * 根据角色ID获取角色信息包含系统信息
 	 *
 	 * @param request
@@ -94,9 +94,9 @@ public interface IPartyRoleService {
 	@RequestMapping(value = "/queryWithSysBySysId", method = RequestMethod.POST )
 	public APIResult<APIPageList<PartyRolePo>> queryWithSysBySysId(
 			@RequestBody(required = true) APIRequest request);
-
+	
 	/**
-	 *
+	 * 
 	 * 分级管理员角色列表(分页条件查询)数据
 	 *
 	 * @param request
@@ -106,9 +106,9 @@ public interface IPartyRoleService {
 	@RequestMapping(value = "/queryWithGrade", method = RequestMethod.POST)
 	public  APIResult<APIPageList<PartyRolePo>> queryWithGrade(
 			@RequestBody(required = true) APIRequest request) throws Exception;
-
+	
 	/**
-	 *
+	 * 
 	 * "构建角色树数据
 	 *
 	 * @param request
@@ -117,9 +117,9 @@ public interface IPartyRoleService {
 	@RequestMapping(value = "/queryWithSys", method = RequestMethod.POST )
 	public APIResult<List<PartyRoleTreePo>> queryWithSys(
 			@RequestBody(required = true) APIRequest request);
-
+	
 	/**
-	 *
+	 * 
 	 * 查询角色数据
 	 *
 	 * @param roleId
@@ -129,9 +129,9 @@ public interface IPartyRoleService {
 	public APIResult<PartyRolePo> get(
 			@NotBlank(message = "{com.lc.ibps.org.roleId}")
 			@RequestParam(name = "roleId", required = true)String roleId) ;
-
+	
 	/**
-	 *
+	 * 
 	 * 根据别名查询角色数据
 	 *
 	 * @param roleId
@@ -154,9 +154,9 @@ public interface IPartyRoleService {
 //	public APIResult<RoleSystemPo> getRoleSystem(
 //			@NotBlank(message = "{com.lc.ibps.org.roleId}") 
 //			@RequestParam(name = "roleId", required = true)String roleId);
-
+	
 	/**
-	 *
+	 * 
 	 * 根据用户ID获取关联角色信息包含系统信息
 	 *
 	 * @param userId
@@ -165,9 +165,9 @@ public interface IPartyRoleService {
 	@RequestMapping(value = "/findByUserId", method = { RequestMethod.GET })
 	public APIResult<List<DefaultPartyRolePo>> findByUserId(
 			@RequestParam(name = "userId", required = false)  String userId);
-
+	
 	/**
-	 *
+	 * 
 	 * 已分配角色列表
 	 *
 	 * @param userId
@@ -175,11 +175,11 @@ public interface IPartyRoleService {
 	 */
 	@RequestMapping(value = "/findAssignedByUserId", method = { RequestMethod.GET })
 	public APIResult<List<PartyRolePo>> findAssignedByUserId(
-			@NotBlank(message = "{com.lc.ibps.org.userId}")
+			@NotBlank(message = "{com.lc.ibps.org.userId}") 
 			@RequestParam(name = "userId", required = true) String userId);
-
+	
 	/**
-	 *
+	 * 
 	 * 可分配角色列表
 	 *
 	 * @param userId
@@ -189,9 +189,9 @@ public interface IPartyRoleService {
 	public APIResult<List<PartyRolePo>> findCanBeAssignedByUserId(
 			@NotBlank(message = "{com.lc.ibps.org.userId}")
 			@RequestParam(name = "userId", required = true) String userId);
-
+	
 	/**
-	 *
+	 * 
 	 * 获取组织或岗位的默认角色
 	 *
 	 * @param orgId
@@ -201,14 +201,14 @@ public interface IPartyRoleService {
 	 */
 	@RequestMapping(value = "/findWithSysByIds", method = { RequestMethod.POST })
 	public APIResult<List<PartyRolePo>> findWithSysByIds(
-			@NotBlank(message = "{com.lc.ibps.org.orgId}")
+			@NotBlank(message = "{com.lc.ibps.org.orgId}") 
 			@RequestParam(name = "orgId", required = false) String orgId,
-			@NotBlank(message = "{com.lc.ibps.org.positionId}")
+			@NotBlank(message = "{com.lc.ibps.org.positionId}") 
 			@RequestParam(name = "positionId", required = false) String positionId,
 			@RequestParam(name = "roleIds", required = false)String[] roleIds);
-
+	
 	/**
-	 *
+	 * 
 	 * 删除角色
 	 *
 	 * @param roleIds
@@ -216,11 +216,11 @@ public interface IPartyRoleService {
 	 */
 	@RequestMapping(value = "/remove", method = { RequestMethod.POST})
 	public APIResult<Void> remove(
-			@NotEmpty(message = "{com.lc.ibps.org.roleIds}")
+			@NotEmpty(message = "{com.lc.ibps.org.roleIds}") 
 			@RequestParam(name = "roleIds", required = true) String[] roleIds);
-
+	
 	/**
-	 *
+	 * 
 	 * 添加用户
 	 *
 	 * @param roleId
@@ -229,9 +229,9 @@ public interface IPartyRoleService {
 	 */
 	@RequestMapping(value = "/addUser", method = { RequestMethod.POST})
 	public APIResult<Void> addUser(
-			@NotBlank(message = "{com.lc.ibps.org.roleId}")
+			@NotBlank(message = "{com.lc.ibps.org.roleId}") 
 			@RequestParam(name = "roleId", required = true) String roleId,
-			@NotEmpty(message = "{com.lc.ibps.org.userIds}")
+			@NotEmpty(message = "{com.lc.ibps.org.userIds}") 
 			@RequestParam(name = "userIds", required = true) String[] userIds);
 
 	/**
@@ -248,9 +248,9 @@ public interface IPartyRoleService {
 			@RequestParam(name = "oldRoleId", required = true) String oldRoleId,
 			@NotBlank(message = "{com.lc.ibps.org.provider.PartyRoleProvider.newAlias}")
 			@RequestParam(name = "newAlias", required = true) String newAlias);
-
+	
 	/**
-	 *
+	 * 
 	 * 移除用户
 	 *
 	 * @param roleId
@@ -259,13 +259,13 @@ public interface IPartyRoleService {
 	 */
 	@RequestMapping(value = "/removeUser", method = { RequestMethod.POST})
 	public APIResult<Void> removeUser(
-			@NotBlank(message = "{com.lc.ibps.org.roleId}")
+			@NotBlank(message = "{com.lc.ibps.org.roleId}") 
 			@RequestParam(name = "roleId", required = true) String roleId,
-			@NotEmpty(message = "{com.lc.ibps.org.userIds}")
+			@NotEmpty(message = "{com.lc.ibps.org.userIds}") 
 			@RequestParam(name = "userIds", required = true) String[] userIds);
-
+	
 	/**
-	 *
+	 * 
 	 * 根据子系统ID或名字获取角色列表
 	 *
 	 * @param request
@@ -275,9 +275,9 @@ public interface IPartyRoleService {
 	@RequestMapping(value = "/queryBySubSysIdOrName", method = RequestMethod.POST)
 	public APIResult<APIPageList<PartyRoleTreePo>> queryBySubSysIdOrName(
 			@RequestBody(required = true) APIRequest request);
-
+	
 	/**
-	 *
+	 * 
 	 * 查询角色树
 	 *
 	 * @param request
@@ -287,8 +287,8 @@ public interface IPartyRoleService {
 	@RequestMapping(value = "/findTreeData", method = RequestMethod.POST)
 	public APIResult<List<PartyRoleTreePo>> findTreeData(
 			@RequestBody(required = true) APIRequest request);
-
-
+	
+	
 	@RequestMapping(value = "/transfer", method = { RequestMethod.POST })
 	public APIResult<Map<String, Map<String, String>>> transfer(
 			@RequestBody(required = true) IdKeyVo idKeyVo);

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/platform/service/PartyRoleProviderService.java

@@ -368,7 +368,7 @@ public class PartyRoleProviderService {
     @Transactional(readOnly = true)
     public APIResult<PermissionPageList<PermissionViewDTO>> getPeoplePermission(APIRequest request) {
 
-        String peopleName = (String) getCustomParamFormRequest(request, "peopleName");
+        String peopleName = (String) getCustomParamFormRequest(request, "roleName");
         String pageName = (String) getCustomParamFormRequest(request, "pageName");
 
         int page = 1;