From a2a9bf529f5a7afe46a8db83623497f9382775b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=96=E6=B0=B8?= <lerry903@163.com>
Date: Tue, 18 Jun 2024 11:02:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:#5728=20=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=BB=91=E5=AE=9A=E5=90=8E=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E8=BF=98=E6=98=AF=E6=98=BE=E7=A4=BA=E6=9C=AA=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pig4cloud/pigx/admin/api/vo/UserVO.java   | 23 ++++++++++---------
 .../main/resources/mapper/SysUserMapper.xml   | 18 ++++++++++-----
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java
index 694b28aac..e6f384e6d 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java
@@ -89,6 +89,18 @@ public class UserVO implements Serializable {
 	@Schema(description = "开源中国 open id")
 	private String oscOpenId;
 
+	/**
+	 * 企微微信 userid
+	 */
+	@Schema(description = "企微微信 userid")
+	private String wxCpUserid;
+
+	/**
+	 * 钉钉 userid
+	 */
+	@Schema(description = "钉钉 userid")
+	private String wxDingUserid;
+
 	/**
 	 * 创建时间
 	 */
@@ -185,16 +197,5 @@ public class UserVO implements Serializable {
 	@Schema(description = "邮箱")
 	private String email;
 
-	/**
-	 * 企微微信 userid
-	 */
-	@Schema(description = "企微微信 userid")
-	private String wxCpUserid;
-
-	/**
-	 * 钉钉 userid
-	 */
-	@Schema(description = "钉钉 userid")
-	private String wxDingUserid;
 
 }
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 7cdc5a10e..4fbc59faf 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
@@ -30,16 +30,16 @@
         <result column="avatar" property="avatar"/>
         <result column="wx_openid" property="wxOpenid"/>
         <result column="qq_openid" property="qqOpenid"/>
-        <result column="wx_cp_userid" property="wxCpUserid"/>
-        <result column="wx_ding_userid" property="wxDingUserid"/>
         <result column="gitee_login" property="giteeOpenId"/>
         <result column="osc_id" property="oscOpenId"/>
+        <result column="wx_cp_userid" property="wxCpUserid"/>
+        <result column="wx_ding_userid" property="wxDingUserid"/>
         <result column="ucreate_time" property="createTime"/>
         <result column="uupdate_time" property="updateTime"/>
         <result column="lock_flag" property="lockFlag"/>
         <result column="password_expire_flag" property="passwordExpireFlag"/>
         <result column="password_modify_time" property="passwordModifyTime"/>
-        <result column="udel_flag" property="delFlag"/>
+        <result column="del_flag" property="delFlag"/>
         <result column="dept_id" property="deptId"/>
         <result column="tenant_id" property="tenantId"/>
         <result column="dept_name" property="deptName"/>
@@ -63,6 +63,8 @@
         u.avatar,
         u.wx_openid,
         u.qq_openid,
+        u.gitee_login,
+        u.osc_id,
         u.wx_cp_userid,
         u.wx_ding_userid,
         u.dept_id,
@@ -91,10 +93,10 @@
         u.avatar,
         u.wx_openid,
         u.qq_openid,
-    	u.gitee_login,
-    	u.wx_cp_userid,
-    	u.wx_ding_userid,
+        u.gitee_login,
         u.osc_id,
+        u.wx_cp_userid,
+        u.wx_ding_userid,
         u.del_flag,
         u.lock_flag,
         u.password_expire_flag,
@@ -140,6 +142,8 @@
         u.avatar,
         u.wx_openid,
         u.qq_openid,
+        u.gitee_login,
+        u.osc_id,
         u.wx_cp_userid,
         u.wx_ding_userid,
         u.dept_id,
@@ -188,6 +192,8 @@
         u.avatar,
         u.wx_openid,
         u.qq_openid,
+        u.gitee_login,
+        u.osc_id,
         u.wx_cp_userid,
         u.wx_ding_userid,
         u.dept_id,