主页列表

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

@@ -10,6 +10,7 @@ import com.xxdxxs.db.component.JdbcHelper;
 import com.xxdxxs.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,12 +92,14 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         criteria.andStockGreaterThan(0);
         criteria.andIsDeletedEqualTo(false);
         criteria.andIsOnSaleEqualTo(true);
-        SupplierItemExample.Criteria orCriteria = supplierItemExample.or();
-        JdbcHelper.ifPresent(dto.getIds(), orCriteria::andIdIn);
-        orCriteria.andTypeIn(dto.getTypeList());
-        orCriteria.andStockGreaterThan(0);
-        orCriteria.andIsDeletedEqualTo(false);
-        orCriteria.andIsOnSaleEqualTo(true);
+        if (!CollectionUtils.isEmpty(dto.getIds())) {
+            SupplierItemExample.Criteria orCriteria = supplierItemExample.or();
+            JdbcHelper.ifPresent(dto.getIds(), orCriteria::andIdIn);
+            orCriteria.andTypeIn(dto.getTypeList());
+            orCriteria.andStockGreaterThan(0);
+            orCriteria.andIsDeletedEqualTo(false);
+            orCriteria.andIsOnSaleEqualTo(true);
+        }
         supplierItemExample.setOrderByClause(" update_time desc");
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         return supplierItemMapper.selectByExampleWithBLOBs(supplierItemExample);