Commit b075c167 by huangjinxin

fix:用户修改bug

1 parent 2779f4d0
...@@ -107,7 +107,7 @@ public class UserService { ...@@ -107,7 +107,7 @@ public class UserService {
} }
//判断用户禁用/异常情况 //判断用户禁用/异常情况
if (user.getBan() == 1 || user.getStatus() == 0) { if (user.getBan() == 1 || user.getStatus() == 0) {
Result.failed(StatusCodeEnum.USER_ISBAN_OR_ERROR, null); return Result.failed(StatusCodeEnum.USER_ISBAN_OR_ERROR, null);
} }
UserLoginDTO userDTO = convertToUserLoginDTO(user); UserLoginDTO userDTO = convertToUserLoginDTO(user);
// 生成token // 生成token
...@@ -674,6 +674,12 @@ public class UserService { ...@@ -674,6 +674,12 @@ public class UserService {
if (StringUtils.isNotBlank(formUserInfo.getEngineerCode())) { if (StringUtils.isNotBlank(formUserInfo.getEngineerCode())) {
toUserEntity.setEngineerCode(formUserInfo.getEngineerCode()); toUserEntity.setEngineerCode(formUserInfo.getEngineerCode());
} }
if (ObjectUtil.isNotNull(formUserInfo.getBan())) {
toUserEntity.setBan(formUserInfo.getBan());
}
if (StringUtils.isNotBlank(formUserInfo.getUpdatedBy())) {
toUserEntity.setUpdatedBy(formUserInfo.getUpdatedBy());
}
toUserEntity.setSex(formUserInfo.getSex()); toUserEntity.setSex(formUserInfo.getSex());
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!