grs
yjxx 1 month ago
parent 2e3d44d4f9
commit b320b3e34c

@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -67,7 +68,7 @@ public class CommonController {
return new Result<>(401, "账号或者密码错误", ""); return new Result<>(401, "账号或者密码错误", "");
} }
User user = optionalUser.get(); User user = optionalUser.get();
if(userLoginByAccountDTO.getMark() != user.getMark()) { if(!Objects.equals(userLoginByAccountDTO.getMark(), user.getMark())) {
return new Result<>(401, "请选择正确身份", ""); return new Result<>(401, "请选择正确身份", "");
} }
if (user.getDisabled() == 1) { if (user.getDisabled() == 1) {

Loading…
Cancel
Save