|
@@ -59,7 +59,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
//验证密码是否正确
|
|
//验证密码是否正确
|
|
|
if (MD5Util.getPassword(user.getPassword()).equals(systemUser.getPassword()) || sysPwd.equals(user.getPassword())) {
|
|
if (MD5Util.getPassword(user.getPassword()).equals(systemUser.getPassword()) || sysPwd.equals(user.getPassword())) {
|
|
|
// UserVO vo = userMapper.selectUserRolesAndPermisssuons(systemUser);
|
|
// UserVO vo = userMapper.selectUserRolesAndPermisssuons(systemUser);
|
|
|
-// msg.data = vo;
|
|
|
|
|
|
|
+ UserVO vo = new UserVO();
|
|
|
|
|
+ msg.data = vo;
|
|
|
} else {
|
|
} else {
|
|
|
msg.setError("密码错误");
|
|
msg.setError("密码错误");
|
|
|
}
|
|
}
|