Commit c203f35a8a2c278e6350f75537666869ef739d84
1 parent
2acf27d5
feat(*): 优化代码
- 优化代码
Showing
2 changed files
with
7 additions
and
2 deletions
fw-hestia-common/src/main/java/cn/fw/hestia/common/utils/DateUtil.java
... | ... | @@ -474,7 +474,7 @@ public final class DateUtil { |
474 | 474 | return null; |
475 | 475 | } |
476 | 476 | long result = 0L; |
477 | - long DAY = 24 * 60 * 60 * 1000; | |
477 | + long DAY = 24 * 60 * 60 * 1000L; | |
478 | 478 | long sub = d1.getTime() - d2.getTime(); |
479 | 479 | long daysub = (sub / DAY); |
480 | 480 | long y1 = d1.getYear(), y2 = d2.getYear(); | ... | ... |
fw-hestia-sdk/src/main/java/cn/fw/hestia/sdk/params/ValidList.java
... | ... | @@ -67,7 +67,12 @@ public class ValidList<E> implements List<E> { |
67 | 67 | |
68 | 68 | @Override |
69 | 69 | public boolean containsAll(Collection<?> c) { |
70 | - return list.contains(c); | |
70 | + for (Object e : c) { | |
71 | + if (!contains(e)) { | |
72 | + return false; | |
73 | + } | |
74 | + } | |
75 | + return true; | |
71 | 76 | } |
72 | 77 | |
73 | 78 | @Override | ... | ... |