|
@@ -20,6 +20,7 @@ import com.ruoyi.generator.vo.*;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.apache.logging.log4j.util.Strings;
|
|
|
+import org.apache.poi.xssf.usermodel.XSSFPivotTable;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -96,6 +97,8 @@ public class CommunityArticleController extends BaseController {
|
|
|
@Autowired
|
|
|
private ICommunityCollectionUserService communityCollectionUserService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private CommunityUserPromptMapper communityUserPromptMapper;
|
|
|
|
|
|
/**
|
|
|
* 获取文章列表信息
|
|
@@ -478,6 +481,11 @@ public class CommunityArticleController extends BaseController {
|
|
|
.like("circle_name", circleName));
|
|
|
}
|
|
|
|
|
|
+ //为空返回空值
|
|
|
+ if (communityCircles == null){
|
|
|
+ return AjaxResult.success("圈子为空");
|
|
|
+ }
|
|
|
+
|
|
|
for (CommunityCircle communityCircle : communityCircles) {
|
|
|
Long id = communityCircle.getId();
|
|
|
Long size = communityUserCircleMapper.selectCount(new QueryWrapper<CommunityUserCircle>()
|
|
@@ -991,4 +999,7 @@ public class CommunityArticleController extends BaseController {
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|