From f0f1171d502e7082011ee82b8d66bbfd20b302c2 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 25 Oct 2024 09:17:04 +0800
Subject: [PATCH] =?UTF-8?q?20241025=20=E5=8E=BB=E9=99=A4Logistic=E7=9A=84j?=
 =?UTF-8?q?ulia=20Date?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/factory/entity/Site.java   |  6 ++
 .../modules/sys/entity/SysUserEntity.java     | 22 ++++++++
 .../resources/mapper/factory/SiteMapper.xml   |  4 +-
 src/main/resources/mapper/sys/SysUserDao.xml  | 56 +++++++++++++------
 4 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/factory/entity/Site.java b/src/main/java/com/gaotao/modules/factory/entity/Site.java
index 68cfba5..59ff7e8 100644
--- a/src/main/java/com/gaotao/modules/factory/entity/Site.java
+++ b/src/main/java/com/gaotao/modules/factory/entity/Site.java
@@ -43,4 +43,10 @@ public class Site {
 
     @TableField("default_country")
     private String defaultCountry;
+
+    @TableField("auto_serial_number")
+    private String autoSerialNumber;
+
+    @TableField("site_code")
+    private String siteCode;
 }
diff --git a/src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java b/src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java
index 8215b65..b69217e 100644
--- a/src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java
+++ b/src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java
@@ -95,6 +95,28 @@ public class SysUserEntity implements Serializable {
 	@TableField(exist=false)
 	private String userTypeDesc;
 
+	@TableField(exist = false)
+	private String autoSerialNumber;
+
+	@TableField(exist = false)
+	private String siteCode;
+
+	public String getAutoSerialNumber() {
+		return autoSerialNumber;
+	}
+
+	public void setAutoSerialNumber(String autoSerialNumber) {
+		this.autoSerialNumber = autoSerialNumber;
+	}
+
+	public String getSiteCode() {
+		return siteCode;
+	}
+
+	public void setSiteCode(String siteCode) {
+		this.siteCode = siteCode;
+	}
+
 	public String getUserTypeDesc() {
 		return userTypeDesc;
 	}
diff --git a/src/main/resources/mapper/factory/SiteMapper.xml b/src/main/resources/mapper/factory/SiteMapper.xml
index 490f325..4bc12f7 100644
--- a/src/main/resources/mapper/factory/SiteMapper.xml
+++ b/src/main/resources/mapper/factory/SiteMapper.xml
@@ -17,7 +17,9 @@
                active,
                createTime,
                createBy,
-               default_country
+               default_country,
+               auto_serial_number,
+               site_code
         from site
         <where>
             <if test="siteId != null and siteId != ''">
diff --git a/src/main/resources/mapper/sys/SysUserDao.xml b/src/main/resources/mapper/sys/SysUserDao.xml
index 661f0c0..b5aac38 100644
--- a/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/src/main/resources/mapper/sys/SysUserDao.xml
@@ -25,36 +25,56 @@
 	</select>
 
 	<select id="queryByUserId" resultType="com.gaotao.modules.sys.entity.SysUserEntity">
-		select *,r.role_name as userTypeDesc from sys_user u
-		left join sys_user_role ur on  u.user_id = ur.user_id
-		left join sys_role r on  r.role_id = ur.role_id
-		where u.user_id = #{userId}
-	</select>
+        select u.user_id,
+               u.username,
+               u.password,
+               u.salt,
+               u.email,
+               u.mobile,
+               u.status,
+               u.create_user_id,
+               u.create_time,
+               u.language_default,
+               u.site,
+               u.user_display,
+               u.user_type,
+               r.role_name as userTypeDesc,
+               s.auto_serial_number,
+               s.site_code
+        from sys_user u
+                 left join sys_user_role ur on u.user_id = ur.user_id
+                 left join sys_role r on r.role_id = ur.role_id
+                 left join site s on s.siteId = u.site
+        where u.user_id = #{userId}
+    </select>
 
 	<select id="queryByPage" resultType="com.gaotao.modules.sys.entity.SysUserEntity">
         select u.user_id,
-               username,
-               password,
-               salt,
-               email,
-               mobile,
-               status,
+               u.username,
+               u.password,
+               u.salt,
+               u.email,
+               u.mobile,
+               u.status,
                r.create_user_id,
                u.create_time,
-               language_default,
-               site,
-               user_display,
-               user_type,
-               r.role_name as userTypeDesc
+               u.language_default,
+               u.site,
+               u.user_display,
+               u.user_type,
+               r.role_name as userTypeDesc,
+               s.auto_serial_number,
+               s.site_code
         from sys_user u
                  left join sys_user_role ur on u.user_id = ur.user_id
                  left join sys_role r on r.role_id = ur.role_id
+                 left join site s on s.siteId = u.site
         <where>
             <if test="params.username != null and params.username != ''">
-                and username like #{params.username}
+                and u.username like #{params.username}
             </if>
             <if test="params.userDisplay != null and params.userDisplay != ''">
-                and user_display like #{params.userDisplay}
+                and u.user_display like #{params.userDisplay}
             </if>
             <if test="params.createUserId">
                 and u.create_user_id = #{params.createUserId}