zhangqiankun 3 years ago
parent
commit
927e2ca915

+ 2 - 2
saas-account/src/main/java/com/persagy/person/controller/SaasRoleController.java

@@ -128,8 +128,8 @@ public class SaasRoleController {
     public ResponseResult querySaasRoleByName(@RequestBody @Validated SaasRoleQueryByNameVO queryVO) {
         SaasRole saasRole = new SaasRole();
         BeanUtils.copyProperties(queryVO,saasRole);
-        LambdaQueryWrapper<SaasRole> queryWrapper = new SaasRole.Builder().createQueryWrapper()
-        		.groupCodeEq(saasRole.getGroupCode()).roleNameEq(queryVO.getRoleName()).builderQueryWrapper();
+        LambdaQueryWrapper<SaasRole> queryWrapper = new SaasRole.Builder().createQueryWrapper().groupCodeEq(saasRole.getGroupCode())
+        		.roleNameEq(queryVO.getRoleName()).roleTypeEq(queryVO.getRoleType()).builderQueryWrapper();
         List<SaasRole> list = this.saasRoleService.list(queryWrapper);
         if (CollectionUtil.isEmpty(list)) {
             return ResponseResultUtil.successResult(Lists.newArrayList(), 0L);

+ 3 - 0
saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleQueryByNameVO.java

@@ -27,5 +27,8 @@ public class SaasRoleQueryByNameVO extends BaseGroupModel {
     @NotBlank(message = "角色名称,不可为空")
 	@ApiModelProperty(value = "角色名称,支持模糊查询", example = "zhangsan")
 	private String roleName; 	// 角色名称
+    
+	@ApiModelProperty(value = "角色类型", example = "0")
+	private String roleType;
 
 }