排行榜

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -169,7 +169,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public RanKingUser rankingList(RanKingUserQuery query) {
         RanKingUser ranKingUser = new RanKingUser();
-
         Long time = System.currentTimeMillis(); //当前时间的时间戳
         if (query.getStatus() == 0) {
             long zero1 = time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
@@ -190,8 +189,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             List<RanKingUser> ranKingUsers = baseMapper.selectByRanks(query);
             if (ranKingUsers != null && ranKingUsers.size() != 0) {
                 ranKingUser.setRanKingUsers(ranKingUsers);
+            }else {
+                ranKingUser.setRanKingUsers(new ArrayList<>());
             }
-
         }else {
             Calendar cal = Calendar.getInstance();
             int month = cal.get(Calendar.MONTH) + 1;
@@ -210,6 +210,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             List<RanKingUser> ranKingUsers = baseMapper.selectByRanks(query);
             if (ranKingUsers != null && ranKingUsers.size() != 0) {
                 ranKingUser.setRanKingUsers(ranKingUsers);
+            }else {
+                ranKingUser.setRanKingUsers(new ArrayList<>());
             }
         }
         return ranKingUser;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanServiceImpl.java

@@ -128,9 +128,10 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             UserPlanVo userPlanVo = generateSelf(bo);
             if (bo.getStatus() != null && bo.getStatus() == 1){
                 UserPlan userPlan = new UserPlan();
+
+
                 String s = JSON.toJSONString(userPlanVo.getCalendarStudyVo());
                 String s1 = JSON.toJSONString(userPlanVo.getStudyCount());
-
                 userPlan.setStudyDay(bo.getStudyDay());
                 userPlan.setStudyCount(s1);
                 userPlan.setUserId(bo.getUserId());
@@ -380,11 +381,15 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         }
 
         //原有课程不满足课程节数则再创建课程
-        if (sectionNum == 0){
+        if (sectionNum != 0){
             while (sectionNum != 0 ) {
-                month++;
-                Long firstDayOfMonth = getFirstDayOfMonth(month+1);
-                Long lastDayOfMonth = getLastDayOfMonth(month+1);
+                if (CollectionUtils.isEmpty(userPlanVo1.getCalendarStudyVo())) {
+                    month = cal.get(Calendar.MONTH)+1;
+                }else {
+                    ++month;
+                }
+                Long firstDayOfMonth = getFirstDayOfMonth(month);
+                Long lastDayOfMonth = getLastDayOfMonth(month);
 
                 List<DayStudyVo> dayStudyVos = getDays(firstDayOfMonth, lastDayOfMonth);
                 for (DayStudyVo dayStudyVo : dayStudyVos) {