forked from github/dataease
fix: 第三方用户登录后总是提示修改密码
This commit is contained in:
parent
1f9c39c566
commit
4e308602a7
@ -1,6 +1,5 @@
|
|||||||
package io.dataease.auth.entity;
|
package io.dataease.auth.entity;
|
||||||
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -39,4 +38,7 @@ public class SysUserEntity implements Serializable {
|
|||||||
|
|
||||||
@ApiModelProperty(hidden = true)
|
@ApiModelProperty(hidden = true)
|
||||||
private Boolean isAdmin;
|
private Boolean isAdmin;
|
||||||
|
|
||||||
|
@ApiModelProperty(hidden = true)
|
||||||
|
private Integer from;
|
||||||
}
|
}
|
||||||
|
@ -141,7 +141,7 @@ public class AuthServer implements AuthApi {
|
|||||||
@Override
|
@Override
|
||||||
public Boolean useInitPwd() {
|
public Boolean useInitPwd() {
|
||||||
CurrentUserDto user = AuthUtils.getUser();
|
CurrentUserDto user = AuthUtils.getUser();
|
||||||
if (null == user) {
|
if (null == user || 0 != user.getFrom()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
String md5 = CodingUtil.md5(DEFAULT_PWD);
|
String md5 = CodingUtil.md5(DEFAULT_PWD);
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
<result column="phone" jdbcType="VARCHAR" property="phone"/>
|
<result column="phone" jdbcType="VARCHAR" property="phone"/>
|
||||||
<result column="enabled" property="enabled"/>
|
<result column="enabled" property="enabled"/>
|
||||||
<result column="is_admin" jdbcType="BIT" property="isAdmin"/>
|
<result column="is_admin" jdbcType="BIT" property="isAdmin"/>
|
||||||
|
<result column="from" property="from"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<resultMap id="roleMap" type="io.dataease.auth.api.dto.CurrentRoleDto">
|
<resultMap id="roleMap" type="io.dataease.auth.api.dto.CurrentRoleDto">
|
||||||
@ -21,19 +22,19 @@
|
|||||||
|
|
||||||
|
|
||||||
<select id="findUser" resultMap="baseMap">
|
<select id="findUser" resultMap="baseMap">
|
||||||
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language,is_admin from sys_user where user_id = #{userId}
|
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language,is_admin, `from` from sys_user where user_id = #{userId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findUserByName" resultMap="baseMap">
|
<select id="findUserByName" resultMap="baseMap">
|
||||||
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user where username = #{username}
|
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user where username = #{username}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findLdapUserByName" resultMap="baseMap">
|
<select id="findLdapUserByName" resultMap="baseMap">
|
||||||
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user a where username = #{username} and a.from = 1
|
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user a where username = #{username} and a.from = 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findUserBySub" resultMap="baseMap">
|
<select id="findUserBySub" resultMap="baseMap">
|
||||||
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user where sub = #{sub}
|
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user where sub = #{sub}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="roleCodes" resultType="String">
|
<select id="roleCodes" resultType="String">
|
||||||
|
Loading…
Reference in New Issue
Block a user