From 5bd8ba90bcae880706f7e1307eee972b80bb02e7 Mon Sep 17 00:00:00 2001
From: dute7liang <383200134@qq.com>
Date: Tue, 9 Jan 2024 23:59:20 +0800
Subject: [PATCH] init

---
 .../java/com/ruoyi/cai/dto/admin/vo/UserInfoAdminVo.java     | 2 ++
 ruoyi-cai/src/main/resources/mapper/cai/UserInfoMapper.xml   | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserInfoAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserInfoAdminVo.java
index 9cf8b217..00ce0970 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserInfoAdminVo.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserInfoAdminVo.java
@@ -34,4 +34,6 @@ public class UserInfoAdminVo extends UserInfo {
     private Integer age;
 
     private Integer isAnchor;
+
+    private Integer isUnion;
 }
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserInfoMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserInfoMapper.xml
index 8a25ef7b..d6775759 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/UserInfoMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserInfoMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ruoyi.cai.mapper.UserInfoMapper">
     <select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.UserInfoAdminVo">
-        select t1.*,t2.usercode,t2.nickname,t2.mobile,t2.avatar,t2.gender,t2.is_anchor,t2.age
+        select t1.*,t2.usercode,t2.nickname,t2.mobile,t2.avatar,t2.gender,t2.is_anchor,t2.is_union,t2.age
         from cai_user_info t1
         left join cai_user t2 on t1.user_id = t2.id
         <where>
@@ -18,6 +18,9 @@
             <if test="bo.isAnchor != null">
                 and t2.is_anchor = #{bo.isAnchor}
             </if>
+            <if test="bo.isUnion != null">
+                and t2.is_union = #{bo.isUnion}
+            </if>
         </where>
         order by t2.create_time desc
     </select>