framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
@@ -15,6 +15,7 @@
import cn.lili.modules.lmk.mapper.ActivityReportMapper;
import cn.lili.modules.lmk.service.MyActivityService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xkzhangsan.time.utils.StringUtil;
@@ -23,7 +24,10 @@
import org.springframework.util.Assert;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@@ -116,6 +120,13 @@
        Assert.notNull(vo, "记录不存在");
        ActivityReportVO reportVO = userReport(activityId);
         ActivityReport activityReport =  new LambdaQueryChainWrapper<>(activityReportMapper)
                .eq(ActivityReport::getUserId, UserContext.getCurrentUserId())
                .eq(ActivityReport::getDeleteFlag,0)
                .eq(ActivityReport::getActivityId,activityId)
                .one();
        vo.setIsCollect(activityReport != null);
        //则当前用户未报名
        if (reportVO == null){
            vo.setIsReport(false);