|
@@ -68,15 +68,18 @@ public class ApiAccessLogServiceImpl implements ApiAccessLogService {
|
|
|
@Override
|
|
|
public PageResult<ApiAccessLogRespVO> getApiAccessLogPage(ApiAccessLogPageReqVO pageReqVO) {
|
|
|
PageResult<ApiAccessLogRespVO> bean = BeanUtils.toBean(apiAccessLogMapper.selectPage(pageReqVO), ApiAccessLogRespVO.class);
|
|
|
- List<DictDataRespDTO> datas = dictDataApi.getDictDataList("").getData();
|
|
|
+ List<DictDataRespDTO> datas = dictDataApi.getDictDataList("user_type").getData();
|
|
|
Map<String, Map<Long,String>> userTypeMap =new HashMap<>();
|
|
|
for (DictDataRespDTO data : datas) {
|
|
|
userTypeMap.put(data.getValue(), new HashMap<>());
|
|
|
}
|
|
|
- bean.getList().forEach(item ->userTypeMap.get(item.getUserType().toString()).put(null==item.getUserId()?-1L:item.getUserId(),""));
|
|
|
+ bean.getList().forEach(item ->{
|
|
|
+ userTypeMap.putIfAbsent(item.getUserType().toString(),new HashMap<>());
|
|
|
+ userTypeMap.get(item.getUserType().toString()).put(null==item.getUserId()?-1L:item.getUserId(),"");
|
|
|
+ });
|
|
|
userTypeMap.forEach((key, value) -> {
|
|
|
value.remove(-1L);
|
|
|
-
|
|
|
+ value.remove(0L);
|
|
|
if(value.keySet().isEmpty()){
|
|
|
return;
|
|
|
}
|