diff --git a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java index 99ae03a2e2..cd0c12fff2 100644 --- a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java +++ b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java @@ -1,6 +1,5 @@ package io.dataease.auth.entity; - import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,4 +38,7 @@ public class SysUserEntity implements Serializable { @ApiModelProperty(hidden = true) private Boolean isAdmin; + + @ApiModelProperty(hidden = true) + private Integer from; } diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index a5748dc71a..9bea8f4a0e 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -141,7 +141,7 @@ public class AuthServer implements AuthApi { @Override public Boolean useInitPwd() { CurrentUserDto user = AuthUtils.getUser(); - if (null == user) { + if (null == user || 0 != user.getFrom()) { return false; } String md5 = CodingUtil.md5(DEFAULT_PWD); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml index d9aafa514b..15742fab74 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml @@ -12,6 +12,7 @@ + @@ -21,19 +22,19 @@