DESKTOP-VAEGFGM\zqc 3 mesiacov pred
rodič
commit
7ed38f1677

+ 2 - 1
citu-module-infra/citu-module-infra-biz/src/main/java/com/citu/module/infra/framework/rpc/config/RpcConfiguration.java

@@ -1,10 +1,11 @@
 package com.citu.module.infra.framework.rpc.config;
 
+import com.citu.module.menduner.system.api.user.MendunerUserApi;
 import com.citu.module.system.api.user.AdminUserApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = AdminUserApi.class)
+@EnableFeignClients(clients = {AdminUserApi.class, MendunerUserApi.class})
 public class RpcConfiguration {
 }

+ 6 - 3
citu-module-infra/citu-module-infra-biz/src/main/java/com/citu/module/infra/service/logger/ApiAccessLogServiceImpl.java

@@ -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;
             }