Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-09-04 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8

 java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml

@@ -545,6 +545,12 @@
        <if test="bId != null and bId !=''">
            and u.b_id = #{bId}
        </if>
        <if test="userIds != null and userIds != null">
            and u.user_id in
            <foreach collection="userIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        order by u.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
@@ -619,6 +625,12 @@
        <if test="levelCd !=null and levelCd != ''">
            and u.level_cd= #{levelCd}
        </if>
        <if test="levelCds != null">
            and u.level_cd in
            <foreach collection="levelCds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test='userFlag !=null and userFlag =="1"'>
            and u.level_cd != '02'
        </if>