|
|
@ -106,15 +106,15 @@ public class CarbonPeakConfigServiceImpl extends BaseServiceImpl<CarbonPeakConfi |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public List<SysTenantDTO> tenantList() { |
|
|
public List<SysTenantDTO> tenantList() { |
|
|
|
|
|
boolean flag = true; |
|
|
Map<String,Object> params = new HashMap<>(); |
|
|
Map<String,Object> params = new HashMap<>(); |
|
|
UserDetail userDetail = SecurityUser.getUser(); |
|
|
UserDetail userDetail = SecurityUser.getUser(); |
|
|
Long tenantCode = TenantContext.getTenantCode(userDetail); |
|
|
Long tenantCode = TenantContext.getTenantCode(userDetail); |
|
|
List<Long> tenantCodeList; |
|
|
|
|
|
|
|
|
List<Long> tenantCodeList = new ArrayList<>(); |
|
|
List<Long> resultTenantCodeList= new ArrayList<>(); |
|
|
List<Long> resultTenantCodeList= new ArrayList<>(); |
|
|
|
|
|
|
|
|
if(!Objects.equals(userDetail.getSuperAdmin(), SuperAdminEnum.YES.value()) |
|
|
if(!Objects.equals(userDetail.getSuperAdmin(), SuperAdminEnum.YES.value()) |
|
|
|| !Objects.equals(tenantCode, userDetail.getTenantCode())) { |
|
|
|| !Objects.equals(tenantCode, userDetail.getTenantCode())) { |
|
|
tenantCodeList=sysTenantGroupService.getChildren(tenantCode); |
|
|
|
|
|
|
|
|
flag = false; |
|
|
tenantCodeList.add(tenantCode); |
|
|
tenantCodeList.add(tenantCode); |
|
|
tenantCodeList.add(1001L); |
|
|
tenantCodeList.add(1001L); |
|
|
QueryWrapper wrapper = new QueryWrapper(); |
|
|
QueryWrapper wrapper = new QueryWrapper(); |
|
|
@ -131,7 +131,21 @@ public class CarbonPeakConfigServiceImpl extends BaseServiceImpl<CarbonPeakConfi |
|
|
resultTenantCodeList.add(-1L); |
|
|
resultTenantCodeList.add(-1L); |
|
|
} |
|
|
} |
|
|
params.put("tenantCodeList",resultTenantCodeList); |
|
|
params.put("tenantCodeList",resultTenantCodeList); |
|
|
return sysTenantDao.queryList(params).parallelStream().sorted(Comparator.comparingLong(SysTenantDTO::getTenantCode)).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<SysTenantDTO> tenantDTOS = sysTenantDao.queryList(params).parallelStream().sorted(Comparator.comparingLong(SysTenantDTO::getTenantCode)).collect(Collectors.toList()); |
|
|
|
|
|
if(!flag){ |
|
|
|
|
|
tenantDTOS.forEach(temp->{ |
|
|
|
|
|
if(Objects.equals(temp.getTenantCode(), 1001L)){ |
|
|
|
|
|
temp.setIsOperate(false); |
|
|
|
|
|
temp.setTenantName("系统默认"); |
|
|
|
|
|
}else { |
|
|
|
|
|
temp.setIsOperate(true); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return tenantDTOS; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
|