bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

 src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java

@@ -18,11 +18,20 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
import org.springblade.modules.discuss.entity.UserTopicsEntity;
import org.springblade.modules.discuss.mapper.PublicDiscussMapper;
import org.springblade.modules.discuss.service.IPublicDiscussService;
import org.springblade.modules.discuss.service.IUserPublicEnrollService;
import org.springblade.modules.discuss.service.IUserTopicsService;
import org.springblade.modules.discuss.vo.PublicDiscussVO;
import org.springblade.modules.discuss.vo.UserTopicsVO;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * 公益报名与议事 服务实现类
@@ -33,9 +42,32 @@
@Service
public class PublicDiscussServiceImpl extends ServiceImpl<PublicDiscussMapper, PublicDiscussEntity> implements IPublicDiscussService {

   @Resource
   private IUserPublicEnrollService iUserPublicEnrollService;

   @Resource
   private IUserTopicsService iUserTopicsService;

   @Override
   public IPage<PublicDiscussVO> selectPublicDiscussPage(IPage<PublicDiscussVO> page, PublicDiscussVO publicDiscuss) {
      return page.setRecords(baseMapper.selectPublicDiscussPage(page, publicDiscuss));
      List<PublicDiscussVO> publicDiscussVOS = baseMapper.selectPublicDiscussPage(page, publicDiscuss);
      for (PublicDiscussVO publicDiscussVO : publicDiscussVOS) {
         Long result = iUserPublicEnrollService.getCount(publicDiscussVO.getId());
         if(result != null){
            publicDiscussVO.setEnrollCount(result.intValue());
         }
         UserTopicsVO userTopicsVo = new UserTopicsVO();
         userTopicsVo.setPublicDiscussId(publicDiscussVO.getId());
         Query query = new Query();
         query.setCurrent(1);
         query.setSize(10);
         IPage<UserTopicsVO> userTopicsVOIPage = iUserTopicsService.selectUserTopicsPage(Condition.getPage(query), userTopicsVo);
         if (userTopicsVOIPage != null) {
            Long total = userTopicsVOIPage.getTotal();
            publicDiscussVO.setTopsCount(total.intValue());
         }
      }
      return page.setRecords(publicDiscussVOS);
   }