Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/biz/CustomerBehaviorNotesBiz.java

@@ -150,24 +150,26 @@ public class CustomerBehaviorNotesBiz extends BaseBiz<CustomerBehaviorNotesMappe
             behaviorNoteCollectVo.setU_avg_count(actionAcount.getDefault_u_avg());
             behaviorNoteCollectVos.add(behaviorNoteCollectVo);
         }
+        behaviorNoteCollectVos.sort(Comparator.comparing(BehaviorNoteCollectVo::getBehavior));
         return behaviorNoteCollectVos;
     }
 
     /**
-     *   获取时间间隔 和 开始与结束时间的处理
-     * @param activityId  活动id
-     * @param startTime 筛选的开始时间
-     * @param endTime  筛选的结束时间
+     * 获取时间间隔 和 开始与结束时间的处理
+     *
+     * @param activityId 活动id
+     * @param startTime  筛选的开始时间
+     * @param endTime    筛选的结束时间
      * @return
      */
     private long getBetweenDayAndprocessStartTimeAndEndTime(Integer activityId, AtomicLong startTime, AtomicLong endTime) {
         if (startTime.get() == 0 || endTime.get() == 0) {
             ActivityListDTO activityListDTO = activityFeign.findActivityStartTimeAndEndTimeById(activityId);
             Instant now = Instant.now();
-            if (startTime.get() != 0) {
+            if (startTime.get() != 0 && endTime.get() == 0) {
                 endTime.set(now.toEpochMilli());
             }
-            if (endTime.get() != 0) {
+            if (endTime.get() != 0 && startTime.get() == 0) {
                 startTime.set(activityListDTO.getActivity_startTime());
             }
             if (startTime.get() == 0 && endTime.get() == 0) {