From 4e308602a7626add382a6276ee2ce9da4a794628 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 3 Mar 2022 14:58:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AC=AC=E4=B8=89=E6=96=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E5=90=8E=E6=80=BB=E6=98=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/auth/entity/SysUserEntity.java | 4 +++-
 .../main/java/io/dataease/auth/server/AuthServer.java    | 2 +-
 .../main/java/io/dataease/base/mapper/ext/AuthMapper.xml | 9 +++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

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 @@
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
         <result column="enabled" property="enabled"/>
         <result column="is_admin" jdbcType="BIT" property="isAdmin"/>
+        <result column="from" property="from"/>
     </resultMap>
 
     <resultMap id="roleMap" type="io.dataease.auth.api.dto.CurrentRoleDto">
@@ -21,19 +22,19 @@
 
 
     <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 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 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 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 id="roleCodes" resultType="String">