|
|
@@ -120,7 +120,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
|
|
|
if(keyName!=null && !"".equals(keyName)){
|
|
|
qw.eq("device_name",keyName);
|
|
|
}
|
|
|
- List <GoodsNo> equipmentList = goodsNoMapper.selectList(qw.select("id", "model_no", "state","indate", "goods_id"
|
|
|
+ List <GoodsNo> equipmentList = goodsNoMapper.selectList(qw.eq("type",1).select("id", "model_no", "state","indate", "goods_id"
|
|
|
,"user_id", "update_indate", "is_maintain", "type", " device_name", "device_model", "good_sn_no",
|
|
|
"label_id", "rack_id", "model_id", "u_bit_num","current_state","alarm_level").orderByDesc("id"));
|
|
|
PageInfo<GoodsNo> info = new PageInfo<>(equipmentList);
|
