From 999d2f4d1529c8d62b6cdaf8370d12ba6fd1eaac Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Mon, 6 Feb 2023 16:34:12 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20vue3=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/constant/enums/StyleTypeEnum.java    |   6 +-
 .../main/resources/mapper/SysUserMapper.xml   | 113 +++++++-----------
 2 files changed, 50 insertions(+), 69 deletions(-)

diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/StyleTypeEnum.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/StyleTypeEnum.java
index aa5791057..f3325eb9d 100644
--- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/StyleTypeEnum.java
+++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/StyleTypeEnum.java
@@ -33,7 +33,11 @@ public enum StyleTypeEnum {
 	/**
 	 * magic
 	 */
-	MAGIC("3", "magic");
+	MAGIC("3", "magic"),
+	/**
+	 * element-plus
+	 */
+	PLUS("4", "plus");
 
 	/**
 	 * 类型
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
index 41c7fc4d6..630cc5f03 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -48,86 +48,59 @@
         </collection>
     </resultMap>
 
-    <!-- userVo结果集 -->
-    <resultMap id="userVoResultMap" type="com.pig4cloud.pigx.admin.api.vo.UserVO">
-        <id column="user_id" property="userId"/>
-        <result column="username" property="username"/>
-        <result column="password" property="password"/>
-        <result column="salt" property="salt"/>
-        <result column="phone" property="phone"/>
-        <result column="avatar" property="avatar"/>
-        <result column="wx_openid" property="wxOpenid"/>
-        <result column="qq_openid" property="qqOpenid"/>
-        <result column="ucreate_time" property="createTime"/>
-        <result column="uupdate_time" property="updateTime"/>
-        <result column="lock_flag" property="lockFlag"/>
-        <result column="del_flag" property="delFlag"/>
-        <result column="dept_id" property="deptId"/>
-        <result column="tenant_id" property="tenantId"/>
-        <result column="dept_name" property="deptName"/>
-        <collection property="roleList" ofType="com.pig4cloud.pigx.admin.api.entity.SysRole">
-            <id column="role_id" property="roleId"/>
-            <result column="role_name" property="roleName"/>
-            <result column="role_code" property="roleCode"/>
-            <result column="role_desc" property="roleDesc"/>
-            <result column="rcreate_time" property="createTime"/>
-            <result column="rupdate_time" property="updateTime"/>
-        </collection>
-    </resultMap>
-
     <sql id="userRoleSql">
         u.user_id,
-		u.username,
-		u.password,
-		u.salt,
-		u.phone,
-		u.avatar,
-		u.wx_openid,
-		u.qq_openid,
-		u.dept_id,
-		u.del_flag,
-		u.lock_flag,
-		u.tenant_id,
+        u.username,
+        u.password,
+        u.salt,
+        u.phone,
+        u.avatar,
+        u.wx_openid,
+        u.qq_openid,
+        u.dept_id,
+        u.del_flag,
+        u.lock_flag,
+        u.tenant_id,
         u.create_by,
-		u.create_time  ucreate_time,
-		u.update_time  uupdate_time,
-		r.role_id,
-		r.role_name,
-		r.role_code,
-		r.role_desc,
-		r.create_time  rcreate_time,
-		r.update_time  rupdate_time
+        u.create_time  ucreate_time,
+        u.update_time  uupdate_time,
+        r.role_id,
+        r.role_name,
+        r.role_code,
+        r.role_desc,
+        r.create_time  rcreate_time,
+        r.update_time  rupdate_time
     </sql>
 
     <sql id="userRoleDeptSql">
         u.user_id,
-		u.username,
-		u.password,
-		u.salt,
-		u.phone,
-		u.avatar,
-		u.wx_openid,
-		u.qq_openid,
-		u.del_flag,
-		u.lock_flag,
-		u.tenant_id,
+        u.username,
+        u.password,
+        u.salt,
+        u.phone,
+        u.avatar,
+        u.wx_openid,
+        u.qq_openid,
+        u.del_flag,
+        u.lock_flag,
+        u.tenant_id,
         u.nickname,
         u.name,
         u.email,
         u.create_by,
-		u.create_time  ucreate_time,
-		u.update_time  uupdate_time,
-		r.role_id,
-		r.role_name,
-		r.role_code,
-		r.role_desc,
-		r.create_time  rcreate_time,
-		r.update_time  rupdate_time,
-		d.name  dept_name,
-		d.dept_id
+        u.create_time  ucreate_time,
+        u.update_time  uupdate_time,
+        r.role_id,
+        r.role_name,
+        r.role_code,
+        r.role_desc,
+        r.create_time  rcreate_time,
+        r.update_time  rupdate_time,
+        d.name  dept_name,
+        d.dept_id
     </sql>
 
-    <select id="getUserVoByUsername" resultMap="userVoResultMap">
+    <select id="getUserVoByUsername" resultMap="baseResultMap">
         SELECT
         <include refid="userRoleSql"/>
         FROM
@@ -137,7 +110,7 @@
         WHERE u.username = #{username}
     </select>
 
-    <select id="getUserVoById" resultMap="userVoResultMap">
+    <select id="getUserVoById" resultMap="baseResultMap">
         SELECT
         <include refid="userRoleDeptSql"/>
         FROM
@@ -182,6 +155,10 @@
             <if test="query.deptId != null and query.deptId != ''">
                 AND u.dept_id = #{query.deptId}
             </if>
+            <if test="query.phone != null and query.phone != ''">
+                <bind name="phoneLike" value="'%'+query.phone+'%'"/>
+                AND u.phone LIKE #{phoneLike}
+            </if>
         </where>
 
         <if test="_databaseId != 'mssql'">