Commit 8903649a by guojuxing

联合商户,资源组授权列表标志是否已经授权

parent 9001dda3
......@@ -181,10 +181,11 @@ public class UnionEnterpriseAuthController {
/**
* 资源组
* @param enterpriseId 联合商户ID
* @return
*/
@RequestMapping("list-resource-group")
public RestResponse listResourceGroup() {
public RestResponse listResourceGroup(Integer enterpriseId) {
ServiceResponse<List<ResourceGroupDTO>> response = resourceGroupApiService.listResourceGroup(null,
UserDetailUtils.getUserDetail().getEnterpriseId());
if (response.isSuccess()) {
......@@ -193,11 +194,20 @@ public class UnionEnterpriseAuthController {
ServiceResponse<List<UnionEnterpriseAuthDTO>> unionEnterpriseResponse = unionEnterpriseAuthApiService
.listUnionEnterpriseAuth(UserDetailUtils.getUserDetail().getEnterpriseId());
Set<String> authResourceGroupSet = new HashSet<>();
if (unionEnterpriseResponse.isSuccess()) {
List<UnionEnterpriseAuthDTO> unionEnterprise = unionEnterpriseResponse.getResult();
if (CollectionUtils.isNotEmpty(unionEnterprise)) {
authResourceGroupSet = unionEnterprise.stream()
.filter(e -> e.getResourceGroupId() != null)
.filter(e -> {
if (enterpriseId != null) {
if (e.getUnionEnterpriseId().equals(enterpriseId)) {
return false;
}
}
return true;
})
.map(e -> e.getResourceGroupId().toString())
.collect(Collectors.toSet());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment