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

张天森

2022-10-17 55985d42ef0ec3d9a62b46184d0bb3f191100a6c

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

@@ -131,16 +131,16 @@
    <select id="selectListByDepartmentId"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
         <where>
             user_type=2 and status=0
        <if test="list!=null">
            and  department_id in
            <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
                #{id}
            </foreach>
         </if>
         <if test="classifyIdFront!=null and classifyIdFront!='' and classifyIdAfter!=null and classifyIdAfter!=''">
            and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%'))
         </if>
            user_type=2 and status=0
            <if test="list!=null">
                and  department_id in
                <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
                    #{id}
                </foreach>
             </if>
             <if test="classifyIdFront!=null and classifyIdFront!='' and classifyIdAfter!=null and classifyIdAfter!=''">
                and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%'))
             </if>

         </where>
         order by transaction_num