标签id查询商品2

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

@@ -127,7 +127,7 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         criteria.andIsDeletedEqualTo(false);
         criteria.andIsOnSaleEqualTo(true);
         supplierItemExample.setOrderByClause(" distribution_price desc");
-        PageHelper.startPage(1, 4);
+        PageHelper.startPage(1, 8);
         return supplierItemMapper.selectByExampleWithBLOBs(supplierItemExample);
     }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionBookServiceImpl.java

@@ -81,7 +81,7 @@ public class CollectionBookServiceImpl implements CollectionBookService {
     public Result findList(CollectionBookRequestDto dto) {
         try {
             List<Map<String, Object>> list = new ArrayList<>();
-            long userId = dto.getUserId();
+            Long userId = dto.getUserId();
             String shareRecordId = dto.getShareRecordId();
             if (StringUtils.hasLength(shareRecordId)) {
                 CollectionShareRecord collectionShareRecord = collectionShareRecordDao.findById(shareRecordId);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionItemsRelationServiceImpl.java

@@ -137,9 +137,17 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
             PageInfo pageInfo = null;
             //标签id为空则查询所有的藏品
             if (dto.getCollectionBookId() == null) {
+                Long userId = dto.getUserId();
+                if (StringUtils.hasLength(dto.getShareRecordId())) {
+                    CollectionShareRecord collectionShareRecord = collectionShareRecordDao.findById(dto.getShareRecordId());
+                    long itemUserId = collectionShareRecord.getItemUserId();
+                    if (itemUserId != userId) {
+                        userId = itemUserId;
+                    }
+                }
                 //查询所有的上传藏品
                 supplierItemRequestDto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
-                supplierItemRequestDto.setCreatorId(dto.getUserId());
+                supplierItemRequestDto.setCreatorId(userId);
                 supplierItemRequestDto.setIsDeleted(false);
                 supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
                 pageInfo =  new PageInfo<>(supplierItemList);