Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-10-21 6e6f4887eaeb046ccdc76a79375a8c7ff47daa96

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

@@ -143,11 +143,15 @@
        <include refid="selectSysUserVo"/>
        <where>
            <if test="userId!=null and userId!='' ">
                user_id= #{userId}
                AND user_id= #{userId}
            </if>

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

            <if test="loginName!=null and loginName!='' ">
                AND login_name= #{loginName}
            </if>

        </where>