From 9da93c4afbed1485961b56f3ae8d06a59194c81c Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 26 Aug 2024 23:44:17 +0800
Subject: [PATCH] =?UTF-8?q?mes=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/system/api/domain/SysUser.java  | 9 +++++++++
 .../src/main/resources/mapper/system/SysUserMapper.xml   | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java
index 7b7fd728..95b7f8e1 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java
@@ -106,6 +106,15 @@ public class SysUser extends BaseEntity {
 
 	//新增 微信账号
 	private String wxId;
+	private String userMType;
+
+	public String getUserMType() {
+		return userMType;
+	}
+
+	public void setUserMType(String userMType) {
+		this.userMType = userMType;
+	}
 
 	public String getWxId() {
 		return wxId;
diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml
index c7352643..6b316b1a 100644
--- a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
 		<result property="wxId"       column="wx_id"/>
+		<result property="userMType"       column="user_m_type"/>
+
         <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
 
@@ -51,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<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, u.wx_id,
-        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,u.user_m_type,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
@@ -168,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
 		    <if test="wxId != null and wxId != ''">wx_id,</if>
+		    <if test="userMType != null and userMType != ''">user_m_type,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -183,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
 		    <if test="wxId != null and wxId != ''">#{wxId},</if>
+			<if test="userMType != null and userMType != ''">#{userMType},</if>
 		GETDATE()
  		)
 	</insert>
@@ -217,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
 			<if test="wxId != null">wx_id = #{wxId},</if>
+			<if test="userMType != null">user_m_type = #{userMType},</if>
  			update_time = GETDATE()
  		</set>
  		where user_id = #{userId}