Merge branch 'master' into dev-xym-update-his

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformPlanServiceImpl.java

@@ -338,6 +338,12 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
             }
         }
         for (GzhPlanVideoContentItemParam vo : param.getVideoList()) {
+            if (!StringUtils.hasText(vo.getCustomTitle())) {
+                vo.setCustomTitle(null);
+            }
+            if (!StringUtils.hasText(vo.getCustomCover())) {
+                vo.setCustomCover(null);
+            }
             if (existsVideoIds.contains(vo.getVideoId())) {
                 ContentPlatformGzhPlanVideo item = existsVideoMap.get(vo.getVideoId());
                 item.setTitle(vo.getTitle());
@@ -365,7 +371,7 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
                 }
                 item.setCreateAccountId(loginAccount.getId());
                 item.setCreateTimestamp(System.currentTimeMillis());
-                gzhPlanVideoMapper.insertSelective(item);
+                gzhPlanVideoMapper.insert(item);
             }
         }
         if (CollectionUtils.isNotEmpty(param.getVideoList())) {

api-module/src/main/resources/mapper/contentplatform/ext/ContentPlatformDataStatMapperExt.xml

@@ -110,7 +110,7 @@
         select date_str, channel, first_level_count, score
         from content_platform_qw_datastat_total
         where channel = #{channel}
-        order by date_str desc
+        order by date_str desc, id
         limit #{offset}, #{pageSize}
     </select>
 
@@ -125,7 +125,7 @@
         select date_str, channel, first_level_count, score
         from content_platform_qw_datastat_reply_total
         where channel = #{channel}
-        order by date_str desc
+        order by date_str desc, id
         limit #{offset}, #{pageSize}
     </select>
 
@@ -140,7 +140,7 @@
         select date_str, sub_channel, first_level_count, score
         from content_platform_qw_datastat_sub_channel
         where create_account_id = #{createAccountId}
-        order by date_str desc
+        order by date_str desc, id
         limit #{offset}, #{pageSize}
     </select>