Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-19 dd730295a1df836c872d22a69a816f52e4c5d431

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -92,7 +92,10 @@
        select count(user_id) from automessage_sys_user
        <where>
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%')
                AND user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart
                WHERE organization_name like concat('%', #{userName}, '%')))

            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
@@ -115,7 +118,10 @@
        <include refid="selectSysUserVo"/>
        <where>
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%')
                AND user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart
                WHERE organization_name like concat('%', #{userName}, '%')))

            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}