空值修复

community-service/src/main/java/com/tanpu/community/service/ThemeService.java

@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -312,6 +313,9 @@ public class ThemeService {
 
     //统计主题集合的浏览量
     public Map<String, Integer> getForwardCountMap(List<String> themeIds) {
+        if (CollectionUtils.isEmpty(themeIds)){
+            return new HashMap<String, Integer>();
+        }
         LambdaQueryWrapper<ThemeEntity> wrapper = new LambdaQueryWrapper<ThemeEntity>()
                 .eq(ThemeEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED)
                 .in(ThemeEntity::getFormerThemeId,themeIds)

docs/create.sql

@@ -132,7 +132,6 @@ CREATE TABLE `black_list` (
   `blocker` varchar(64) NOT NULL COMMENT '屏蔽发起人',
   `blocked_type` int(4) NOT NULL COMMENT '屏蔽类型，1：用户，2：内容',
   `blocked_id` varchar(64) NOT NULL COMMENT '被屏蔽的',
-  `create_by` varchar(64) DEFAULT '',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
@@ -140,21 +139,6 @@ CREATE TABLE `black_list` (
   INDEX `uk_blocked` (`blocked_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='黑名单';
 
-
-CREATE TABLE `black_list` (
-  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
-  `blocker` varchar(64) NOT NULL COMMENT '屏蔽发起人',
-  `blocked_type` int(4) NOT NULL COMMENT '屏蔽类型',
-  `blocked_id` varchar(64) NOT NULL COMMENT '被屏蔽的',
-  `create_by` varchar(64) DEFAULT '',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `delete_tag` int(3) NOT NULL DEFAULT '0',
-  INDEX `uk_blocker` (`blocker`),
-  INDEX `uk_blocked` (`blocked_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='黑名单';
-
-
 CREATE TABLE `visit_summary` (
   `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
   `session_id` varchar(64) NOT NULL COMMENT 'session_id',
@@ -179,6 +163,7 @@ CREATE TABLE `report_log` (
   `report_type` int(4) NOT NULL COMMENT '举报类型，1：主题，2：评论 3、用户',
   `target_id` varchar(64) NOT NULL COMMENT '举报对象id',
   `target_user_id` varchar(64) NOT NULL COMMENT '举报对象作者id',
+  `report_reason` varchar(64) COMMENT '举报理由',
   `report_time` datetime NOT NULL COMMENT '上报时间',
   `deal_result` int(4)  COMMENT '处理结果 0：无操作 1：屏蔽 2：删除 ',
   `deal_user_id` int(4)  COMMENT '处理管理员',