Merge remote-tracking branch 'origin/quanku_0930' into quanku_0930

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

@@ -213,6 +213,7 @@ public class ItemServiceImpl implements ItemService {
                 nickname = user.getNickname();
                 avatar = user.getAvatar();
             }
+            boolean isGuest = dto.getUserId().equals(userId);
             if (!officialUserIds.contains(dto.getUserId())) {
                 // 查询用户和藏品关联表
                 List<UserItemsRelation> userItemsRelations = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
@@ -225,7 +226,7 @@ public class ItemServiceImpl implements ItemService {
                 coinRequestDto.setPage(dto.getPage());
                 coinRequestDto.setLimit(dto.getSize());
                 coinRequestDto.setIds(itemIds);
-                coinRequestDto.setIsGuest(!dto.getUserId().equals(userId));
+                coinRequestDto.setIsGuest(isGuest);
                 coinRequestDto.setViewPermission(dto.getViewPermission());
                 // 分页查询
                 PageInfo<Item> pageInfo = itemDao.findPageNotDeleted(coinRequestDto);
@@ -250,6 +251,9 @@ public class ItemServiceImpl implements ItemService {
                     // 设置是否收藏和是否是自己发布的
                     vo.setIsCollected(0);
                     vo.setIsMine(1);
+                    if (isGuest) {
+                        vo.setIsMine(0);
+                    }
                     vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId(), null) ? 1 : 0);
                     // 设置收藏数
                     long count = favoritesItemsRelationDao.countByItemId(item.getId());
@@ -298,6 +302,9 @@ public class ItemServiceImpl implements ItemService {
                         vo.setHomePageImage(MediaUtil.getHomePageImage(es.getImages(), es.getVideos()));
                         // 设置是否收藏和是否是自己发布的
                         vo.setIsMine(1);
+                        if (isGuest) {
+                            vo.setIsMine(0);
+                        }
                         vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId(), null) ? 1 : 0);
                         // 设置收藏数
                         long count = favoritesItemsRelationDao.countByItemId(es.getId());