From e67f11afb6c4c10262c60ca2bf22a44c6708a973 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Sat, 8 Jul 2023 23:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-gateway/src/main/resources/bootstrap.yml             | 6 +++++-
 .../com/ruoyi/system/controller/CompetitionController.java | 7 ++++---
 .../com/ruoyi/system/mapper/CompetitionMembersMapper.java  | 2 +-
 .../ruoyi-system/src/main/resources/bootstrap.yml          | 4 ++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 333bcd57..c28d4daa 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -2,7 +2,11 @@
 server:
   port: 8080
 # Spring
-spring: 
+spring:
+  servlet:
+    multipart:
+      max-file-size: 30MB
+      max-request-size: 100MB
   application:
     # 应用名称
     name: ruoyi-gateway
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java
index 77949d01..85258e03 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java
@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.exception.CheckedException;
 import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.exception.UtilException;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.utils.SecurityUtils;
@@ -305,7 +306,7 @@ public class CompetitionController extends BaseController
         return AjaxResult.success(smsResponse);
     }
 
-    @PostMapping("/teamEnrollExcleImport")
+    @PostMapping(value = "/teamEnrollExcleImport",produces = "application/json;charset=utf-8")
     @ResponseBody
     @ApiOperation(value = ApiTerminal.wxMiniProgram+"导入球队报名excel(包含图片)")
     public AjaxResult teamEnrollExcleImport(
@@ -347,7 +348,7 @@ public class CompetitionController extends BaseController
         //读图片--结束
         // printImg(maplist);
         //获得数据的总行数
-        int totalRowNum = sheet.getLastRowNum();
+        int totalRowNum = sheet.getPhysicalNumberOfRows();
         //todo 获取赛事编码
         Row row1 = sheet.getRow(1);
         Cell cell1 = row1.getCell(5);
@@ -434,7 +435,7 @@ public class CompetitionController extends BaseController
         //保存图片
         PictureData pictureData = maplist.get("5_0");
         if (pictureData == null) {
-            throw new CheckedException("球队logo不能为空");
+            throw new UtilException("球队logo不能为空");
         }
         byte[] data = pictureData.getData();
         //得到保存的file
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java
index 4fba8e16..ce5b0f5e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java
@@ -63,7 +63,7 @@ public interface CompetitionMembersMapper
 
     List<CompetitionMembersVo> getJoinCompetitionMembersPage(CompetitionMembersVo entity);
 
-    void deleteByMembers(Long competitionId, Long teamOfId);
+    void deleteByMembers(@Param(value = "competitionId")Long competitionId,@Param(value = "teamOfId") Long teamOfId);
 
     List<CompetitionMembersVo> getCompetitionMembersByCompetitionId(Long competitionId);
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 413156b3..59f231d1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -7,6 +7,10 @@ mybatis:
     mapUnderscoreToCamelCase: true
 # Spring
 spring:
+  servlet:
+    multipart:
+      max-file-size: 30MB
+      max-request-size: 100MB
   application:
     # 应用名称
     name: ruoyi-system