zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!106 fix #I4Z1AN 修复字典类型常量类 错误问题,操作人id取值错误 

Merge pull request !106 from 感觉/master
pull/2/head
芋道源码 2022-03-22 09:44:27 +00:00 committed by Gitee
parent 000263e092 5614a8495f
commit 1f0535d055
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java
View File

@ -14,16 +14,16 @@ public interface DictTypeConstants {
String USER_SEX = "system_user_sex"; // 用户性别 String USER_SEX = "system_user_sex"; // 用户性别
String OPERATE_TYPE = "sys_operate_type"; // 操作类型 String OPERATE_TYPE = "system_operate_type"; // 操作类型
String LOGIN_TYPE = "sys_login_type"; // 登录日志的类型 String LOGIN_TYPE = "system_login_type"; // 登录日志的类型
String LOGIN_RESULT = "sys_login_result"; // 登录结果 String LOGIN_RESULT = "system_login_result"; // 登录结果
String ERROR_CODE_TYPE = "system_error_code_type"; // 错误码的类型枚举 String ERROR_CODE_TYPE = "system_error_code_type"; // 错误码的类型枚举
String SMS_CHANNEL_CODE = "sys_sms_channel_code"; // 短信渠道编码 String SMS_CHANNEL_CODE = "system_sms_channel_code"; // 短信渠道编码
String SMS_TEMPLATE_TYPE = "sys_sms_template_type"; // 短信模板类型 String SMS_TEMPLATE_TYPE = "system_sms_template_type"; // 短信模板类型
String SMS_SEND_STATUS = "sys_sms_send_status"; // 短信发送状态 String SMS_SEND_STATUS = "system_sms_send_status"; // 短信发送状态
String SMS_RECEIVE_STATUS = "sys_sms_receive_status"; // 短信接收状态 String SMS_RECEIVE_STATUS = "system_sms_receive_status"; // 短信接收状态
} }

2
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java
View File

@ -30,7 +30,7 @@ public interface OperateLogConvert {
default List<OperateLogExcelVO> convertList(List<OperateLogDO> list, Map<Long, AdminUserDO> userMap) { default List<OperateLogExcelVO> convertList(List<OperateLogDO> list, Map<Long, AdminUserDO> userMap) {
return list.stream().map(operateLog -> { return list.stream().map(operateLog -> {
OperateLogExcelVO excelVO = convert02(operateLog); OperateLogExcelVO excelVO = convert02(operateLog);
MapUtils.findAndThen(userMap, operateLog.getId(), user -> excelVO.setUserNickname(user.getNickname())); MapUtils.findAndThen(userMap, operateLog.getUserId(), user -> excelVO.setUserNickname(user.getNickname()));
excelVO.setSuccessStr(SUCCESS.getCode().equals(operateLog.getResultCode()) ? "成功" : "失败"); excelVO.setSuccessStr(SUCCESS.getCode().equals(operateLog.getResultCode()) ? "成功" : "失败");
return excelVO; return excelVO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());