Browse Source

配置修改

吴树波 3 weeks ago
parent
commit
7a7e230242

+ 4 - 4
fs-company/src/main/resources/application.yml

@@ -3,9 +3,9 @@ server:
 # Spring配置
 spring:
   profiles:
-#    active: dev
-#    include: common,config-dev
+    active: dev
+    include: common,config-dev
 #    active: druid-jzzx
 #    include: common,config-druid-jzzx
-    active: druid-hdt
-    include: common,config-druid-hdt
+#    active: druid-hdt
+#    include: common,config-druid-hdt

+ 1 - 1
fs-service/src/main/java/com/fs/sop/service/impl/QwSopTempServiceImpl.java

@@ -437,7 +437,7 @@ public class QwSopTempServiceImpl implements IQwSopTempService
             redMap = new HashMap<>();
         }
 
-        List<FsUserCourseVideoRedPackage> redPackage = ruleList.stream().filter(e -> e.getVideoId() != null).map(e -> {
+        List<FsUserCourseVideoRedPackage> redPackage = ruleList.stream().filter(e -> e.getVideoId() != null && e.getSorts() == 0).map(e -> {
             FsUserCourseVideoRedPackage red = new FsUserCourseVideoRedPackage();
             red.setCompanyId(temp.getCompanyId());
             red.setVideoId(e.getVideoId());