学习计划更新

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

@@ -367,7 +367,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         RanKingUser ranKingUser = baseMapper.selectByRank(query);
         if (ranKingUser != null && ranKingUser.getHourse() != null) {
             Integer rank = baseMapper.selectByRankOne(Convert.toInt(ranKingUser.getHourse()));
-            return rank;
+            return rank+1;
          }
         return 0;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationUseServiceImpl.java

@@ -113,6 +113,9 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
         if (baseMapper.queryByUse(bo) > 0){
             throw new IllegalArgumentException("已领取活动，请勿重复领取");
         }
+        if (bo.getConfigurationId() == null){
+            throw new IllegalArgumentException("活动ID为空");
+        }
         //未领取过领取活动
         bo.setCreateTime(DateUtils.getNowTime());
         ActivityConfigurationVo activityConfigurationVo = activityConfigurationService.queryById(bo.getConfigurationId());