bug修复

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/CollectionBookRequestDto.java

@@ -47,4 +47,9 @@ public class CollectionBookRequestDto extends BaseRequestDto implements Entity
      * 是否返回"我收藏的"标签
      */
     private Boolean isHasExtraLabel;
+
+    /**
+     * 分享id
+     */
+    private String shareRecordId;
 }

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

@@ -4,11 +4,14 @@ import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.distribution.CollectionBookDao;
 import com.wwdz.ch.db.dao.distribution.CollectionItemsRelationDao;
+import com.wwdz.ch.db.dao.distribution.CollectionShareRecordDao;
 import com.wwdz.ch.db.domain.distribution.CollectionBook;
+import com.wwdz.ch.db.domain.distribution.CollectionShareRecord;
 import com.wwdz.ch.db.dto.request.distribution.CollectionBookRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.CollectionItemsRelationRequestDto;
 import com.wwdz.ch.wx.service.distribution.CollectionBookService;
 import com.xxdxxs.utils.EntityMapper;
+import com.xxdxxs.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,9 @@ public class CollectionBookServiceImpl implements CollectionBookService {
     @Autowired
     CollectionItemsRelationDao collectionItemsRelationDao;
 
+    @Autowired
+    CollectionShareRecordDao collectionShareRecordDao;
+
     @Override
     public Result create(CollectionBookRequestDto dto) {
         try {
@@ -74,8 +80,17 @@ public class CollectionBookServiceImpl implements CollectionBookService {
     @Override
     public Result findList(CollectionBookRequestDto dto) {
         try {
-            List<CollectionBook> collectionBookList = collectionBookDao.findByUserId(dto.getUserId());
             List<Map<String, Object>> list = new ArrayList<>();
+            long userId = dto.getUserId();
+            String shareRecordId = dto.getShareRecordId();
+            if (StringUtils.hasLength(shareRecordId)) {
+                CollectionShareRecord collectionShareRecord = collectionShareRecordDao.findById(shareRecordId);
+                long itemUserId = collectionShareRecord.getItemUserId();
+                if (itemUserId != userId) {
+                    userId = itemUserId;
+                }
+            }
+            List<CollectionBook> collectionBookList = collectionBookDao.findByUserId(userId);
             collectionBookList.forEach(collectionBook -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("id", collectionBook.getId());

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

@@ -107,6 +107,8 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
             supplierItemRequestDto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
             supplierItemRequestDto.setCreatorId(searchUserId);
             supplierItemRequestDto.setIsDeleted(false);
+            supplierItemRequestDto.setPage(dto.getPage());
+            supplierItemRequestDto.setLimit(dto.getLimit());
             List<SupplierItem> supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
             List<SupplierItemVo> list = new ArrayList<>();
             PageInfo<SupplierItem> pageInfo = new PageInfo<>(supplierItemList);