|
@@ -51,7 +51,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
@Resource
|
|
@Resource
|
|
private SysUserDepartMapper sysUserDepartMapper;
|
|
private SysUserDepartMapper sysUserDepartMapper;
|
|
@Autowired
|
|
@Autowired
|
|
- private ISysBaseApi sysBaseAPI;
|
|
|
|
|
|
+ private ISysBaseApi sysBaseApi;
|
|
@Resource
|
|
@Resource
|
|
private SysDepartMapper sysDepartMapper;
|
|
private SysDepartMapper sysDepartMapper;
|
|
@Resource
|
|
@Resource
|
|
@@ -230,7 +230,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
// info.setSysUserName(user.getRealname());
|
|
// info.setSysUserName(user.getRealname());
|
|
|
|
|
|
|
|
|
|
- LoginUser user = sysBaseAPI.getUserByName(username);
|
|
|
|
|
|
+ LoginUser user = sysBaseApi.getUserByName(username);
|
|
if (user != null) {
|
|
if (user != null) {
|
|
info.setSysUserCode(user.getUsername());
|
|
info.setSysUserCode(user.getUsername());
|
|
info.setSysUserName(user.getRealname());
|
|
info.setSysUserName(user.getRealname());
|
|
@@ -405,18 +405,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
//情况1:根据用户信息查询,该用户不存在
|
|
//情况1:根据用户信息查询,该用户不存在
|
|
if (sysUser == null) {
|
|
if (sysUser == null) {
|
|
result.error500("该用户不存在,请注册");
|
|
result.error500("该用户不存在,请注册");
|
|
- sysBaseAPI.addLog("用户登录失败,用户不存在!", CommonConstant.LOG_TYPE_1, null);
|
|
|
|
|
|
+ sysBaseApi.addLog("用户登录失败,用户不存在!", CommonConstant.LOG_TYPE_1, null);
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
//情况2:根据用户信息查询,该用户已注销
|
|
//情况2:根据用户信息查询,该用户已注销
|
|
if (CommonConstant.DEL_FLAG_1.toString().equals(sysUser.getDelFlag())) {
|
|
if (CommonConstant.DEL_FLAG_1.toString().equals(sysUser.getDelFlag())) {
|
|
- sysBaseAPI.addLog("用户登录失败,用户名:" + sysUser.getUsername() + "已注销!", CommonConstant.LOG_TYPE_1, null);
|
|
|
|
|
|
+ sysBaseApi.addLog("用户登录失败,用户名:" + sysUser.getUsername() + "已注销!", CommonConstant.LOG_TYPE_1, null);
|
|
result.error500("该用户已注销");
|
|
result.error500("该用户已注销");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
//情况3:根据用户信息查询,该用户已冻结
|
|
//情况3:根据用户信息查询,该用户已冻结
|
|
if (CommonConstant.USER_FREEZE.equals(sysUser.getStatus())) {
|
|
if (CommonConstant.USER_FREEZE.equals(sysUser.getStatus())) {
|
|
- sysBaseAPI.addLog("用户登录失败,用户名:" + sysUser.getUsername() + "已冻结!", CommonConstant.LOG_TYPE_1, null);
|
|
|
|
|
|
+ sysBaseApi.addLog("用户登录失败,用户名:" + sysUser.getUsername() + "已冻结!", CommonConstant.LOG_TYPE_1, null);
|
|
result.error500("该用户已冻结");
|
|
result.error500("该用户已冻结");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|