From fb514e661e644bc40dba3d2413a64ff5e86bf6be Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 11 六月 2025 11:02:29 +0800
Subject: [PATCH] add: 点赞、收藏功能补充

---
 src/main/java/com/mzl/flower/service/film/impl/FilmWorksServiceImpl.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/film/impl/FilmWorksServiceImpl.java b/src/main/java/com/mzl/flower/service/film/impl/FilmWorksServiceImpl.java
index 4fa277e..030f7e2 100644
--- a/src/main/java/com/mzl/flower/service/film/impl/FilmWorksServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/film/impl/FilmWorksServiceImpl.java
@@ -87,8 +87,18 @@
         if(StringUtils.isNotBlank(dto.getCreateDateEndStr())){
             dto.setCreateDateEnd(DateUtils.dateToLocalDateTime(dto.getCreateDateEndStr(),false));
         }
+
+        //todo 这里的用户ID可能为空,用户存在不登录的情况下访问,传null
+        try {
+            dto.setUserId(SecurityUtils.getUserId());
+        } catch (Exception e) {
+            dto.setUserId(null);
+        }
+
         List<FilmWorksVO> list =  filmWorksMapper.queryPage(dto,page);
         page.setRecords(list);
+
+
         return page;
     }
 
@@ -129,13 +139,14 @@
 
     @Override
     public FilmWorksVO detail(Long id) {
-        FilmWorks filmWork = filmWorksMapper.selectById(id);
-        if(filmWork==null){
+        // userId 可以是空,因为用户可以登录
+
+        String userId = SecurityUtils.getUserId();
+        FilmWorksVO filmWorksVO = filmWorksMapper.selectInfoById(id,userId);
+        if(filmWorksVO==null){
             return null;
         }
-        FilmWorksVO filmWorksVO = new FilmWorksVO();
-        BeanUtils.copyProperties(filmWork,filmWorksVO);
-        CustomerDTO currentCustomer = customerMapper.getCurrentCustomer(filmWork.getCreateBy());
+        CustomerDTO currentCustomer = customerMapper.getCurrentCustomer(filmWorksVO.getCreateBy());
         filmWorksVO.setNickname(currentCustomer.getNickName());
         filmWorksVO.setAvatar(currentCustomer.getCover());
         return filmWorksVO;

--
Gitblit v1.9.3