From 6dbb1248a8ea2e1d70957be7cee9cf29e5bcf477 Mon Sep 17 00:00:00 2001 From: "xiex@fjhrt.com" Date: Tue, 22 Mar 2022 17:17:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B8=B8=E9=87=8F=E7=B1=BB=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98,=E5=AF=BC=E8=87=B4=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BB=8E=E5=AD=97=E5=85=B8=E7=BC=93=E5=AD=98=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/enums/DictTypeConstants.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java index c49524245..c0e342383 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java @@ -14,16 +14,16 @@ public interface DictTypeConstants { 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_RESULT = "sys_login_result"; // 登录结果 + String LOGIN_TYPE = "system_login_type"; // 登录日志的类型 + String LOGIN_RESULT = "system_login_result"; // 登录结果 String ERROR_CODE_TYPE = "system_error_code_type"; // 错误码的类型枚举 - String SMS_CHANNEL_CODE = "sys_sms_channel_code"; // 短信渠道编码 - String SMS_TEMPLATE_TYPE = "sys_sms_template_type"; // 短信模板类型 - String SMS_SEND_STATUS = "sys_sms_send_status"; // 短信发送状态 - String SMS_RECEIVE_STATUS = "sys_sms_receive_status"; // 短信接收状态 + String SMS_CHANNEL_CODE = "system_sms_channel_code"; // 短信渠道编码 + String SMS_TEMPLATE_TYPE = "system_sms_template_type"; // 短信模板类型 + String SMS_SEND_STATUS = "system_sms_send_status"; // 短信发送状态 + String SMS_RECEIVE_STATUS = "system_sms_receive_status"; // 短信接收状态 } From 5614a8495fb37c2460ff4c6ad0261ba0c9c18bd2 Mon Sep 17 00:00:00 2001 From: "xiex@fjhrt.com" Date: Tue, 22 Mar 2022 17:34:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E7=94=A8=E6=88=B7id=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E6=88=90=E5=90=8D=E7=A7=B0=E6=97=B6id=E5=8F=96?= =?UTF-8?q?=E9=94=99=E5=BE=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/system/convert/logger/OperateLogConvert.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java index 21584c9fc..21f7a4948 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java @@ -30,7 +30,7 @@ public interface OperateLogConvert { default List convertList(List list, Map userMap) { return list.stream().map(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()) ? "成功" : "失败"); return excelVO; }).collect(Collectors.toList());