|
|
@@ -192,6 +192,9 @@ public class UserController extends BaseController {
|
|
|
sysUser.setRealName(username);
|
|
|
}
|
|
|
sysUser.setUsername(username);
|
|
|
+ if(SysUserType.TEACHER.getCode().equals(authUser.getClientId().toUpperCase())){
|
|
|
+ sysUser.setLastUsernameTime(new Date());
|
|
|
+ }
|
|
|
}
|
|
|
/*if(StringUtils.isEmpty(sysUser.getImToken())){
|
|
|
ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), username, sysUser.getAvatar()));
|
|
|
@@ -570,14 +573,14 @@ public class UserController extends BaseController {
|
|
|
if (authUser == null) {
|
|
|
return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
}
|
|
|
- setReq.setClientId(authUser.getClientId());
|
|
|
+ setReq.setClientId(authUser.getClientId().toUpperCase());
|
|
|
|
|
|
SysUser user = sysUserService.get(authUser.getUserId());
|
|
|
if (user == null || null == user.getId()) {
|
|
|
return failed("用户不存在");
|
|
|
}
|
|
|
|
|
|
- if (SysUserType.TEACHER.getCode().equals(authUser.getClientId())) {
|
|
|
+ if (SysUserType.TEACHER.getCode().equals(authUser.getClientId().toUpperCase())) {
|
|
|
//判断用户昵称修改时间
|
|
|
if (StringUtils.isNotEmpty(setReq.getUsername())) {
|
|
|
checkLastUsernameTime(user, setReq.getUsername());
|
|
|
@@ -596,7 +599,7 @@ public class UserController extends BaseController {
|
|
|
if (null != user.getLastUsernameTime()
|
|
|
&& StringUtils.isNotEmpty(configValue)) {
|
|
|
Long lastUsernameMonth = Long.parseLong(configValue);
|
|
|
- Long monthDiff = DateUtil.getMonthDiff(new Date(), user.getLastUsernameTime());
|
|
|
+ Long monthDiff = DateUtil.getMonthDiff(user.getLastUsernameTime(),new Date());
|
|
|
|
|
|
if (monthDiff < lastUsernameMonth && lastUsernameMonth > 0) {
|
|
|
throw new BizException("每隔" + lastUsernameMonth + "个月可修改一次");
|
liweifan