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 @@
-
-
+
+
-
+
@@ -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,