fix
This commit is contained in:
@@ -76,11 +76,11 @@ public class ShopInfoDAO {
|
||||
return shopInfoMapper.getShopList(lineId);
|
||||
}
|
||||
|
||||
public List<ShopInfoDO> getShopListByRegion(Long lineId,List<Long> regionIdList){
|
||||
public List<ShopInfoDO> getShopListByRegion(Long lineId,List<Long> regionIdList,String userId){
|
||||
if(Objects.isNull(lineId)){
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return shopInfoMapper.getShopListByRegion(lineId,regionIdList);
|
||||
return shopInfoMapper.getShopListByRegion(lineId,regionIdList,userId);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -39,7 +39,7 @@ public interface ShopInfoMapper extends Mapper<ShopInfoDO> {
|
||||
*/
|
||||
List<ShopInfoDO> getShopList(@Param("lineId") Long lineId);
|
||||
|
||||
List<ShopInfoDO> getShopListByRegion(@Param("lineId") Long lineId,@Param("list") List<Long> regions);
|
||||
List<ShopInfoDO> getShopListByRegion(@Param("lineId") Long lineId,@Param("list") List<Long> regions,@Param("userId") String userId);
|
||||
|
||||
/**
|
||||
* 店铺信息
|
||||
|
||||
@@ -330,6 +330,12 @@
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="userId ==null or userId ==''">
|
||||
and shop_status in (0,1)
|
||||
</if>
|
||||
<if test="userId !=null and userId !=''">
|
||||
and shop_status in (0,1,2)
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<select id="getShopPointListByDevelopmentManager" resultType="com.cool.store.dto.point.ShopPointDTO">
|
||||
|
||||
Reference in New Issue
Block a user