Merge remote-tracking branch 'origin/master'

platform-admin/src/main/java/com/platform/controller/TbCfStationItemController.java

@@ -319,7 +319,7 @@ public class TbCfStationItemController extends ApiBaseAction {
         String[] idArr = ids.split(",");
 
         query.put("ids", idArr);
-        List<TbCfStationItemEntity> itemList = tbCfStationItemService.queryItemByIds(query);
+        List<TbCfStationItemEntity> itemList = tbCfStationItemService.queryItemByIds(idArr);
         int total = tbCfStationItemService.countItemByIds(idArr);
         PageUtils pageUtil = new PageUtils(itemList, total, query.getLimit(), query.getPage());
         return R.ok().put("page", pageUtil);

platform-admin/src/main/java/com/platform/dao/TbCfStationItemDao.java

@@ -17,7 +17,7 @@ import java.util.Map;
 public interface TbCfStationItemDao extends BaseDao<TbCfStationItemEntity> {
 
 
-    List<TbCfStationItemEntity> queryItemByIds(Map<String, Object> params);
+    List<TbCfStationItemEntity> queryItemByIds(String [] ids);
 
     int changeItemStatus(@Param("status") Integer status, @Param("itemIds") String[] itemIds);
 

platform-admin/src/main/java/com/platform/service/TbCfStationItemService.java

@@ -112,7 +112,7 @@ public interface TbCfStationItemService {
 
     List<TbCfStationItemEntity> getAdvertisementItem(Map<String, Object> map);
 
-    List<TbCfStationItemEntity> queryItemByIds(Map<String, Object> params);
+    List<TbCfStationItemEntity> queryItemByIds(String [] ids);
 
     int countItemByIds(String[] ids);
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfStationItemServiceImpl.java

@@ -583,8 +583,8 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
     }
 
     @Override
-    public List<TbCfStationItemEntity> queryItemByIds(Map<String, Object> params) {
-        return tbCfStationItemDao.queryItemByIds(params);
+    public List<TbCfStationItemEntity> queryItemByIds(String [] ids) {
+        return tbCfStationItemDao.queryItemByIds(ids);
     }
 
     @Override

platform-admin/src/main/resources/com/platform/dao/TbCfStationItemDao.xml

@@ -85,7 +85,7 @@
         template
         from tb_cf_station_item i
         where i.item_id in
-        <foreach item="itemId" collection="ids" open="(" separator="," close=")">
+        <foreach item="itemId" collection="array" open="(" separator="," close=")">
             #{itemId}
         </foreach>
         <if test="offset != null and limit != null">