|
@@ -232,9 +232,9 @@ public class CommunityTagController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 获取标签信息(当前用户是否已拉黑)
|
|
|
+ * 获取标签信息(获取拉黑标签信息)
|
|
|
*/
|
|
|
- @ApiOperation("获取标签信息(附带拉黑信息)")
|
|
|
+ @ApiOperation("获取拉黑标签信息")
|
|
|
@GetMapping("/tagsTakeBlock")
|
|
|
@Transactional
|
|
|
//@Anonymous
|
|
@@ -285,7 +285,8 @@ public class CommunityTagController extends BaseController {
|
|
|
//int offset = (pageNum - 1) * pageSize;
|
|
|
|
|
|
Page<CommunityTagBlock> page = new Page<>(pageNum, pageSize);
|
|
|
- if (userId == null) {
|
|
|
+
|
|
|
+ if (isToken && userId == null) {
|
|
|
userId = SecurityUtils.getUserId();
|
|
|
}
|
|
|
|
|
@@ -317,6 +318,7 @@ public class CommunityTagController extends BaseController {
|
|
|
|
|
|
if (isToken) {
|
|
|
for (CommunityTag communityTag : communityTags) {
|
|
|
+ communityTag.setIsBlock(true);
|
|
|
CommunityUserTag userTag = communityUserTagMapper
|
|
|
.selectOne(new QueryWrapper<CommunityUserTag>()
|
|
|
.eq("tag_id", communityTag.getId())
|