Merge remote-tracking branch 'origin/master'

xuhy

2025-09-28 a11b770b58782328356851bccb53990b7e0f406d

 ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml

@@ -25,5 +25,44 @@
    <sql id="Base_Column_List">
        id, nick_name, phone, account, password, team_name, team_id, status, practical_train_count, other_count, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TAppUserPageVo">
        SELECT
        t1.id, t1.nick_name, t1.phone, t1.account, t1.password, t1.team_name, t1.team_id, t1.status,
        t1.practical_train_count,
        t1.other_count, t1.create_time, t1.update_time, t1.create_by, t1.update_by, t1.disabled,t2.team_name
        FROM
        t_app_user t1 left join t_division_team t2 on t1.team_id = t2.id
        WHERE
        t1.disabled = 0 and t1.state =1
        <if test="query.nickName != null and query.nickName!=''">
            and (t1.nick_name like concat('%',#{query.nickName},'%') or t1.phone like concat('%',#{query.nickName},'%'))
        </if>

        <if test="query.status != null ">
            and t1.status =#{query.status}
        </if>
        order by t1.create_time desc



    </select>
    <select id="pageAuditList" resultType="com.ruoyi.system.vo.TAppUserPageVo">
        SELECT
        t1.id, t1.nick_name, t1.phone, t1.account, t1.password, t1.team_name, t1.team_id, t1.status,
        t1.practical_train_count,
        t1.other_count, t1.create_time, t1.update_time, t1.create_by, t1.update_by, t1.disabled,t2.team_name
        FROM
        t_app_user t1 left join t_division_team t2 on t1.team_id = t2.id
        WHERE
        t1.disabled = 0
        <if test="query.nickName != null and query.nickName!=''">
            and (t1.nick_name like concat('%',#{query.nickName},'%') or t1.phone like concat('%',#{query.nickName},'%'))
        </if>

        <if test="query.status != null ">
            and t1.status =#{query.status}
        </if>
        order by t1.create_time desc
    </select>

</mapper>