fix

coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

@@ -346,17 +346,13 @@
         select
         <include refid="allColumn"/>
         from xfsg_shop_info where line_id = #{lineId} and deleted= '0'
-        and ( 1=1
-        <if test="userId!=null and userId!=''">
-            or investment_manager = #{userId}
-        </if>
         <if test="list!=null and list.size>0">
-            or region_id in
+            and region_id in
             <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
-        )
+
 
     </select>
 
@@ -389,15 +385,16 @@
             </if>
         </where>
     </select>
-    <select id="selectInvestmentByList" resultType="com.cool.store.entity.ShopInfoDO">
-        select line_id as LineId,
-        investment_manager as investmentManager,
-        development_manager as developmentManager
+    <select id="selectByLines" resultType="com.cool.store.entity.ShopInfoDO">
+        select *
         from xfsg_shop_info
         where line_id in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
+        <foreach collection="regionIds" item="item" index="index" open="and region_id in (" separator="," close=")">
+            #{item}
+        </foreach>
     </select>
 
     <update id="batchUpdate" parameterType="list">