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

张天森

2022-10-13 2c19b79eade460a50f0d61b2e41e46662286934e

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

@@ -123,7 +123,7 @@
    <select id="selectListByDepartmentId"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
         <where>
             user_type=2 and status=1
             user_type=2 and status=0
        <if test="list!=null">
            and  department_id in
            <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">