黑名单代码优化

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -1169,12 +1169,17 @@ public class CommunityArticleController extends BaseController {
 
     @ApiOperation("搜索黑名单")
     @GetMapping("/userListBlock")
-    public AjaxResult userListBlock(String SearchValue) {
+    public AjaxResult userListBlock(String SearchValue,Long userId) {
 
         int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
         int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         int offset = (pageNum - 1) * pageSize;
-        Long userId = SecurityUtils.getLoginUser().getUserId();
+
+        if (userId == null) {
+            userId = SecurityUtils.getUserId();
+        }
+
+
         List<CommunityUserInfoVo> communityUserInfoVos = null;
         try {
             communityUserInfoVos = communityArticleService.selectBlockUserBySearchValue(SearchValue,userId,offset,pageSize);

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityTagController.java

@@ -287,7 +287,7 @@ public class CommunityTagController extends BaseController {
 
         Page<CommunityTagBlock> page = new Page<>(pageNum, pageSize);
 
-        if (userId == null) {
+        if (isToken && userId == null) {
             userId = SecurityUtils.getUserId();
         }