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 93af06408..02186a7d5 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 @@ -88,6 +88,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; + /** * 创建时间 */ 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 c148efe51..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 @@ -32,12 +32,14 @@ + + - + @@ -61,6 +63,10 @@ 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, u.del_flag, u.lock_flag, @@ -89,6 +95,8 @@ u.qq_openid, u.gitee_login, u.osc_id, + u.wx_cp_userid, + u.wx_ding_userid, u.del_flag, u.lock_flag, u.password_expire_flag, @@ -134,6 +142,10 @@ 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, u.create_by, u.create_time ucreate_time, @@ -180,6 +192,10 @@ 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, u.create_by, u.create_time ucreate_time,