|
@@ -44,10 +44,7 @@ import javax.persistence.criteria.CriteriaBuilder;
|
|
|
import javax.persistence.criteria.CriteriaQuery;
|
|
import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Predicate;
|
|
import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
import javax.persistence.criteria.Root;
|
|
|
-import java.util.Date;
|
|
|
|
|
-import java.util.HashMap;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* Created by wangyc on 2018/6/26.
|
|
* Created by wangyc on 2018/6/26.
|
|
@@ -255,7 +252,11 @@ public class ProductAttachServiceImpl implements ProductAttachService {
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public List<ProductAttachSubmit> findByProductidsAndStatus(List<Long> productids, Integer status) {
|
|
public List<ProductAttachSubmit> findByProductidsAndStatus(List<Long> productids, Integer status) {
|
|
|
- return productAttachSubmitDao.findByProductIdsAndStatus(productids, status);
|
|
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(productids) || status == null) {
|
|
|
|
|
+ return productAttachSubmitDao.findByProductIdsAndStatus(productids, status);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return Collections.emptyList();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|