From bcb76a2989ce096c1ec2d49bf0c90b659de8e7c8 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Thu, 9 Feb 2023 15:43:55 +0800
Subject: [PATCH] userId类型转换修正
---
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/LoginController.java | 1 +
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/LoginController.java
index 5506683..1102001 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/LoginController.java
@@ -124,6 +124,7 @@ public class LoginController {
// update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
LoginUser loginUser = new LoginUser();
BeanUtils.copyProperties(sysUser, loginUser);
+ loginUser.setId(sysUser.getId() + "");
baseCommonService.addLog("用户名: " + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser);
// update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员
return result;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
index 3261dd9..e82844b 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
@@ -117,6 +117,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
return null;
}
BeanUtils.copyProperties(sysUser, loginUser);
+ loginUser.setId(sysUser.getId() + "");
return loginUser;
}
@@ -246,6 +247,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
return null;
}
BeanUtils.copyProperties(sysUser, loginUser);
+ loginUser.setId(sysUser.getId() + "");
return loginUser;
}
@@ -727,6 +729,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
for (SysUser user : sysUsers) {
LoginUser loginUser = new LoginUser();
BeanUtils.copyProperties(user, loginUser);
+ loginUser.setId(user.getId() + "");
loginUsers.add(loginUser);
}
return loginUsers;
--
libgit2 0.22.2