123

ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java

@@ -13,6 +13,7 @@ import com.ruoyi.cai.service.AnchorService;
 import com.ruoyi.cai.service.AnchorTopService;
 import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.ServletUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -106,13 +107,19 @@ public class HomeManager {
         }else if(anchorListQueryTypeEnum == AnchorListQueryTypeEnum.NEW){
             RBucket<List<AnchorListVo>> bucket = redissonClient.getBucket(RedisHttpConstant.HOME_NEW_REDIS);
             vos = bucket.get();
-        } else { // 同城查询
+        } else if(anchorListQueryTypeEnum == AnchorListQueryTypeEnum.CITY){ // 同城查询
             if(query.getCityId() == null){
                 return Collections.emptyList();
             }
             query.setOnlineStatus(1);
             query.setOpenVideoStatus(1);
+            if(pageQuery.checkPageNum(20)){
+                return Collections.emptyList();
+            }
+            pageQuery.resetPageSize();
             return anchorService.pageApp(pageQuery, query).getRecords();
+        }else{
+            return Collections.emptyList();
         }
         Collections.shuffle(vos);
         Integer pageNum = pageQuery.getPageNum();

ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java

@@ -36,7 +36,6 @@ public interface DynamicService extends IService<Dynamic> {
 
     void clearDynamic(Integer hours);
 
-    @Transactional(rollbackFor = Exception.class)
     void deleteDynamicAdmin(Long id);
 
     boolean auditSuccess(List<Long> ids);

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java

@@ -218,7 +218,6 @@ public class DynamicServiceImpl extends ServiceImpl<DynamicMapper, Dynamic> impl
         }
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void deleteDynamicAdmin(Long id){
         this.removeById(id);

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SmsVerifyServiceImpl.java

@@ -133,7 +133,7 @@ public class SmsVerifyServiceImpl extends ServiceImpl<SmsVerifyMapper,SmsVerify>
             List<SmsVerify> list = this.list(Wrappers.lambdaUpdate(SmsVerify.class)
                     .lt(SmsVerify::getCreateTime, deleteTimeFlag)
                     .last("limit 100"));
-            if(index > 500 || CollectionUtils.isEmpty(list)){
+            if(index > 5000 || CollectionUtils.isEmpty(list)){
                 break;
             }
             index++;

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java

@@ -137,6 +137,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             mapperQuery.setNickname(query.getText());
         }else if(query.getType() == 3){
             mapperQuery.setUsercode(query.getText());
+        }else{
+            return new Page<>();
         }
         return baseMapper.pageApp(page.build(),mapperQuery);
     }