Merge remote-tracking branch 'origin/master' into prod

authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -326,4 +326,21 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
         sysWorkVos.forEach(sysWorkVo -> sysWorkVo.setPassword(null));
         return R.ok(sysWorkVos);
     }
+
+
+    @ApiOperation("根据角色编号获取权限用户ID")
+    @Override
+    public R<List<Long>> getUserIdListByRole(ListByRoleDto listDto) {
+        String roleCode = listDto.getRoleCode();
+        Long sysId = listDto.getSysId();
+        SysRole sysRole = sysRoleMapper.selectOne(Wrappers.<SysRole>lambdaQuery().eq(SysRole::getCode, roleCode).eq(SysRole::getSysId, sysId));
+        Long roleId = sysRole.getId();
+        List<SysUserRole> sysUserRoles = sysUserRoleService.list(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getRoleId, roleId).eq(SysUserRole::getSysId, sysId));
+        if (CollUtil.isEmpty(sysUserRoles)) {
+            return R.ok();
+        }
+        List<Long> uIds = sysUserRoles.stream().map(SysUserRole::getWorkUserId).collect(Collectors.toList());
+        return R.ok(uIds);
+    }
+
 }

authorize-api/src/main/java/com/xy/dto/SysWorkUser/ListByRoleDto.java

@@ -0,0 +1,23 @@
+package com.xy.dto.SysWorkUser;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+@ApiModel
+@Accessors(chain = true)
+public class ListByRoleDto {
+
+    @NotEmpty(message = "角色编号不可为空")
+    @ApiModelProperty(value = "角色编号", required = true)
+    private String roleCode;
+    @NotEmpty(message = "系统ID不可为空")
+    @ApiModelProperty(value = "用户ID", required = true)
+    private Long sysId;
+
+}

authorize-api/src/main/java/com/xy/service/SysWorkUserService.java

@@ -41,4 +41,13 @@ public interface SysWorkUserService {
 
     @PostMapping("list")
     R<List<SysWorkVo>> list(@RequestBody ListDto listDto);
+
+    /**
+     * 根据角色编号获取权限用户ID
+     *
+     * @param listDto
+     * @return {@link R}<{@link List}<{@link Long}>>
+     */
+    @PostMapping("getUserIdListByRole")
+    R<List<Long>> getUserIdListByRole(@RequestBody @Validated ListByRoleDto listDto);
 }