wms / wms4_shandongtaikai · Commits

Commit bcb76a2989ce096c1ec2d49bf0c90b659de8e7c8

Authored by 谭毅彬
1 parent 593415ac

userId类型转换修正 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 2 changed files with 4 additions and 0 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  View file @bcb76a2
@@ -124,6 +124,7 @@ public class LoginController { @@ -124,6 +124,7 @@ public class LoginController {
124 // update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码 124 // update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
125 LoginUser loginUser = new LoginUser(); 125 LoginUser loginUser = new LoginUser();
126 BeanUtils.copyProperties(sysUser, loginUser); 126 BeanUtils.copyProperties(sysUser, loginUser);
  127 + loginUser.setId(sysUser.getId() + "");
127 baseCommonService.addLog("用户名: " + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser); 128 baseCommonService.addLog("用户名: " + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser);
128 // update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 129 // update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员
129 return result; 130 return result;
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
  View file @bcb76a2
@@ -117,6 +117,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -117,6 +117,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
117 return null; 117 return null;
118 } 118 }
119 BeanUtils.copyProperties(sysUser, loginUser); 119 BeanUtils.copyProperties(sysUser, loginUser);
  120 + loginUser.setId(sysUser.getId() + "");
120 return loginUser; 121 return loginUser;
121 } 122 }
122 123
@@ -246,6 +247,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -246,6 +247,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
246 return null; 247 return null;
247 } 248 }
248 BeanUtils.copyProperties(sysUser, loginUser); 249 BeanUtils.copyProperties(sysUser, loginUser);
  250 + loginUser.setId(sysUser.getId() + "");
249 return loginUser; 251 return loginUser;
250 } 252 }
251 253
@@ -727,6 +729,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @@ -727,6 +729,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
727 for (SysUser user : sysUsers) { 729 for (SysUser user : sysUsers) {
728 LoginUser loginUser = new LoginUser(); 730 LoginUser loginUser = new LoginUser();
729 BeanUtils.copyProperties(user, loginUser); 731 BeanUtils.copyProperties(user, loginUser);
  732 + loginUser.setId(user.getId() + "");
730 loginUsers.add(loginUser); 733 loginUsers.add(loginUser);
731 } 734 }
732 return loginUsers; 735 return loginUsers;