张村牧场修改

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyDataServiceImpl.java

@@ -481,7 +481,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
     public Result listDataTail(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
         String deviceCode = paramsMap.get("deviceCode");
         String type = paramsMap.get("type");
-        String farmId = paramsMap.get("farmId");
+//        String farmId = paramsMap.get("farmId");
 
         if ("".equals(type) || null == type) {
             type = "1";
@@ -502,7 +502,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         List<String> list = new ArrayList<>();
         if ("".equals(deviceCode) || null == deviceCode) {
             QueryWrapper<EnergyEnvDevice> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId);
+            queryWrapper1.in("farm_id", 26,29);
             if ("1".equals(type)) {
                 queryWrapper1.eq("remark", 1);
             } else {