1

src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -17,6 +17,7 @@ import com.izouma.nineth.utils.JpaUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.RandomUtils;
@@ -663,10 +664,12 @@ public class CollectionService {
 //                                .collectionDTOS(pageNew.getContent())
 //                                .build());
 //            }
-            subscribeListDTOS
-                    .add(SubscribeListDTO.builder().dateTime(subscribeTime.getStart())
-                            .collectionDTOS(pageNew.getContent())
-                            .build());
+            if (CollectionUtils.isNotEmpty(pageNew.getContent())){
+                subscribeListDTOS
+                        .add(SubscribeListDTO.builder().dateTime(subscribeTime.getStart())
+                                .collectionDTOS(pageNew.getContent())
+                                .build());
+            }
         });
 //        resultMap.put("notSubscribedIds", );
         return subscribeListDTOS;

src/main/java/com/izouma/nineth/web/SubscribeTimeController.java

@@ -34,8 +34,10 @@ public class SubscribeTimeController extends BaseController {
         if (record.getId() != null) {
             SubscribeTime orig = subscribeTimeRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
+            record.setEnd(record.getStart().plusDays(1).toLocalDate().atStartOfDay());
             return subscribeTimeRepo.save(orig);
         }
+        record.setEnd(record.getStart().plusDays(1).toLocalDate().atStartOfDay());
         return subscribeTimeRepo.save(record);
     }
 

src/main/vue/src/views/SubscribeTimeEdit.vue

@@ -20,14 +20,14 @@
                                             placeholder="选择日期时间">
                                     </el-date-picker>
                         </el-form-item>
-                        <el-form-item prop="end" label="区间结束时间">
-                                    <el-date-picker
-                                            v-model="formData.end"
-                                            type="datetime"
-                                            value-format="yyyy-MM-dd HH:mm:ss"
-                                            placeholder="选择日期时间">
-                                    </el-date-picker>
-                        </el-form-item>
+<!--                        <el-form-item prop="end" label="区间结束时间">-->
+<!--                                    <el-date-picker-->
+<!--                                            v-model="formData.end"-->
+<!--                                            type="datetime"-->
+<!--                                            value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                                            placeholder="选择日期时间">-->
+<!--                                    </el-date-picker>-->
+<!--                        </el-form-item>-->
                         <el-form-item prop="sort" label="排序">
                                     <el-input v-model="formData.sort"></el-input>
                         </el-form-item>