|
@@ -749,7 +749,7 @@ public class UserController {
|
|
User user = userService.getOne(Wrappers.<User>query().lambda()
|
|
User user = userService.getOne(Wrappers.<User>query().lambda()
|
|
.eq(User::getName, dto.getName())
|
|
.eq(User::getName, dto.getName())
|
|
.eq(User::getCredentialNumber, dto.getIdCard())
|
|
.eq(User::getCredentialNumber, dto.getIdCard())
|
|
- .eq(User::getMobile, dto.getMobile())
|
|
|
|
|
|
+ .eq(StrUtil.isNotBlank(dto.getMobile()), User::getMobile, dto.getMobile())
|
|
);
|
|
);
|
|
|
|
|
|
UserStudentAddDto userStudentAddDto = new UserStudentAddDto();
|
|
UserStudentAddDto userStudentAddDto = new UserStudentAddDto();
|
|
@@ -777,7 +777,7 @@ public class UserController {
|
|
if (userStudentInfoVo == null) {
|
|
if (userStudentInfoVo == null) {
|
|
return RT.error("学生不存在!");
|
|
return RT.error("学生不存在!");
|
|
}
|
|
}
|
|
- if(!dto.getMobile().equals(userStudentInfoVo.getMobile())){
|
|
|
|
|
|
+ if(StrUtil.isNotBlank(dto.getMobile())&& !dto.getMobile().equals(userStudentInfoVo.getMobile())) {
|
|
return RT.error("该学生的手机号和当前输入的手机号不一致!");
|
|
return RT.error("该学生的手机号和当前输入的手机号不一致!");
|
|
}
|
|
}
|
|
|
|
|