Commit 6b4f99800bdc269bb673da0277e5a05c1410f414

Authored by 潘钊
1 parent 0631e6cf

update..

src/main/java/com/bsth/data/directive/DayOfDirectives.java
@@ -156,7 +156,7 @@ public class DayOfDirectives { @@ -156,7 +156,7 @@ public class DayOfDirectives {
156 Collection<D60> d60s = d60Map.values(); 156 Collection<D60> d60s = d60Map.values();
157 List<D60> rem60List = new ArrayList<>(); 157 List<D60> rem60List = new ArrayList<>();
158 for(D60 d60 : d60s){ 158 for(D60 d60 : d60s){
159 - if(d60.getDeviceId().equals(device)) 159 + if(device.equals(d60.getDeviceId()))
160 rem60List.add(d60); 160 rem60List.add(d60);
161 } 161 }
162 //清除60数据 162 //清除60数据
@@ -173,7 +173,7 @@ public class DayOfDirectives { @@ -173,7 +173,7 @@ public class DayOfDirectives {
173 Collection<D64> d64s = d64Map.values(); 173 Collection<D64> d64s = d64Map.values();
174 List<D64> rem64List = new ArrayList<>(); 174 List<D64> rem64List = new ArrayList<>();
175 for(D64 d64 : d64s){ 175 for(D64 d64 : d64s){
176 - if(d64.getDeviceId().equals(device)) 176 + if(device.equals(d64.getDeviceId()))
177 rem64List.add(d64); 177 rem64List.add(d64);
178 } 178 }
179 179