Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix][admin] Repair the problem of login error caused by users not bi… #1736

Merged
merged 4 commits into from
Mar 15, 2023
Merged

[Fix][admin] Repair the problem of login error caused by users not bi… #1736

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4418fc9
[Fix][admin] Repair the problem of login error caused by users not bi…
Mar 15, 2023
875d087
[Fix][admin] Repair the problem of login error caused by users not bi…
Mar 15, 2023
deb9a14
[Fix][admin] Repair the problem of login error caused by users not bi…
Mar 15, 2023
a359a2e
[Fix][admin] fix code style
Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[Fix][admin] fix code style
  • Loading branch information
huang committed Mar 15, 2023
commit a359a2ee8461bd0d38c00df7bc1d2724a49c2d76
5 changes: 2 additions & 3 deletions dinky-admin/src/main/java/org/dinky/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;
import lombok.EqualsAndHashCode;
Expand Down Expand Up @@ -69,8 +69,7 @@ public class User implements Serializable {

private Boolean enabled;

@TableLogic
private Boolean isDelete;
@TableLogic private Boolean isDelete;

@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
Expand Down
2 changes: 1 addition & 1 deletion dinky-admin/src/main/java/org/dinky/service/impl/UserServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public Result<UserDTO> loginUser(LoginDTO loginDTO) {
}
// get user tenants and roles
UserDTO userInfo = refreshUserInfo(user);
if (Asserts.isNullCollection(userInfo.getTenantList())){
if (Asserts.isNullCollection(userInfo.getTenantList())) {
return Result.failed(MessageResolverUtils.getMessage("login.user.not.binding"));
}
StpUtil.login(user.getId(), loginDTO.isAutoLogin());
Expand Down
2 changes: 1 addition & 1 deletion dlink-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,5 +160,5 @@
},
"gitHooks": {
"commit-msg": "fabric verify-commit"
}
}
}