Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

无关风月

2024-11-14 3af9c82375df6bd77ae78a5d900c409a895ecd18

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml

@@ -233,14 +233,9 @@
        upload as upload,
        insertTime as insertTime
        from t_company where flag != 3 and state = 0 and id in (
        select companyId from t_company_city where state = 1
        <if test="null != city">
            and cityId in (select id from t_city where englishName in
            <foreach collection="city" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
            )
        </if>
        <foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
            #{item}
        </foreach>
        )
        <if test="null != type">
            and type = #{type}