From 1f97788d81f5286553cd59eb7edbcdda13acf0a4 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Tue, 14 Nov 2023 16:19:18 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=94=A8=E6=88=B7=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B7=A5=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/SysUser.java    | 22 +++++++++++++++++++
 .../resources/mapper/system/SysUserMapper.xml | 12 ++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/aucma-common/src/main/java/com/aucma/common/core/domain/entity/SysUser.java b/aucma-common/src/main/java/com/aucma/common/core/domain/entity/SysUser.java
index 0a2ea9c..3b29a98 100644
--- a/aucma-common/src/main/java/com/aucma/common/core/domain/entity/SysUser.java
+++ b/aucma-common/src/main/java/com/aucma/common/core/domain/entity/SysUser.java
@@ -89,6 +89,28 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    /** 工位编号 */
+    private String stationCode;
+
+    /** 工位名称 */
+    private String stationName;
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
     public SysUser()
     {
 
diff --git a/aucma-system/src/main/resources/mapper/system/SysUserMapper.xml b/aucma-system/src/main/resources/mapper/system/SysUserMapper.xml
index 78cfde0..f91f8fc 100644
--- a/aucma-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,6 +23,8 @@
 		<result property="updateBy"     column="update_by"    />
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
+		<result property="stationCode"       column="station_code"       />
+		<result property="stationName"       column="station_name"       />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
 		<collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
 	</resultMap>
@@ -49,16 +51,19 @@
 	<sql id="selectUserVo">
 		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
 			   d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-			   r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+			   r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, u.station_code ,pl.PRODUCT_LINE_NAME station_name
 		from sys_user u
 				 left join sys_dept d on u.dept_id = d.dept_id
 				 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 BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE =  u.station_code
 	</sql>
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip,
+		       u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader, u.station_code ,pl.PRODUCT_LINE_NAME station_name from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
+		left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE =  u.station_code
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
@@ -159,6 +164,7 @@
 		<if test="status != null and status != ''">status,</if>
 		<if test="createBy != null and createBy != ''">create_by,</if>
 		<if test="remark != null and remark != ''">remark,</if>
+		<if test="stationCode != null and stationCode != ''">station_code,</if>
 		create_time
 		)values(
 		<if test="userId != null and userId != ''">#{userId},</if>
@@ -173,6 +179,7 @@
 		<if test="status != null and status != ''">#{status},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
 		<if test="remark != null and remark != ''">#{remark},</if>
+		<if test="stationCode != null and stationCode != ''">#{stationCode},</if>
 		sysdate
 		)
 	</insert>
@@ -193,6 +200,7 @@
 			<if test="loginDate != null">login_date = #{loginDate},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="remark != null">remark = #{remark},</if>
+			<if test="stationCode != null and stationCode != ''">station_code = #{stationCode},</if>
 			update_time = sysdate
 		</set>
 		where user_id = #{userId}