BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1f0535d0552b926acb637c216be505088d581074

Authored by 芋道源码
Committed by Gitee
2 parents 000263e0 5614a849

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

Merge pull request !106 from 感觉/master
Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java
  View file @1f0535d
@@ -14,16 +14,16 @@ public interface DictTypeConstants { @@ -14,16 +14,16 @@ public interface DictTypeConstants {
14 14
15 String USER_SEX = "system_user_sex"; // 用户性别 15 String USER_SEX = "system_user_sex"; // 用户性别
16 16
17 - String OPERATE_TYPE = "sys_operate_type"; // 操作类型 17 + String OPERATE_TYPE = "system_operate_type"; // 操作类型
18 18
19 - String LOGIN_TYPE = "sys_login_type"; // 登录日志的类型  
20 - String LOGIN_RESULT = "sys_login_result"; // 登录结果 19 + String LOGIN_TYPE = "system_login_type"; // 登录日志的类型
  20 + String LOGIN_RESULT = "system_login_result"; // 登录结果
21 21
22 String ERROR_CODE_TYPE = "system_error_code_type"; // 错误码的类型枚举 22 String ERROR_CODE_TYPE = "system_error_code_type"; // 错误码的类型枚举
23 23
24 - String SMS_CHANNEL_CODE = "sys_sms_channel_code"; // 短信渠道编码  
25 - String SMS_TEMPLATE_TYPE = "sys_sms_template_type"; // 短信模板类型  
26 - String SMS_SEND_STATUS = "sys_sms_send_status"; // 短信发送状态  
27 - String SMS_RECEIVE_STATUS = "sys_sms_receive_status"; // 短信接收状态 24 + String SMS_CHANNEL_CODE = "system_sms_channel_code"; // 短信渠道编码
  25 + String SMS_TEMPLATE_TYPE = "system_sms_template_type"; // 短信模板类型
  26 + String SMS_SEND_STATUS = "system_sms_send_status"; // 短信发送状态
  27 + String SMS_RECEIVE_STATUS = "system_sms_receive_status"; // 短信接收状态
28 28
29 } 29 }
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java
  View file @1f0535d
@@ -30,7 +30,7 @@ public interface OperateLogConvert { @@ -30,7 +30,7 @@ public interface OperateLogConvert {
30 default List<OperateLogExcelVO> convertList(List<OperateLogDO> list, Map<Long, AdminUserDO> userMap) { 30 default List<OperateLogExcelVO> convertList(List<OperateLogDO> list, Map<Long, AdminUserDO> userMap) {
31 return list.stream().map(operateLog -> { 31 return list.stream().map(operateLog -> {
32 OperateLogExcelVO excelVO = convert02(operateLog); 32 OperateLogExcelVO excelVO = convert02(operateLog);
33 - MapUtils.findAndThen(userMap, operateLog.getId(), user -> excelVO.setUserNickname(user.getNickname())); 33 + MapUtils.findAndThen(userMap, operateLog.getUserId(), user -> excelVO.setUserNickname(user.getNickname()));
34 excelVO.setSuccessStr(SUCCESS.getCode().equals(operateLog.getResultCode()) ? "成功" : "失败"); 34 excelVO.setSuccessStr(SUCCESS.getCode().equals(operateLog.getResultCode()) ? "成功" : "失败");
35 return excelVO; 35 return excelVO;
36 }).collect(Collectors.toList()); 36 }).collect(Collectors.toList());