文件上传

platomix-gmetry-system-api/pom.xml

@@ -10,7 +10,7 @@
     <!--    日期和版本号需要同时升级-->
     <!--    4.2.64-2024.07.22->4.2.65-2024.07.22->4.2.66-2024.07.23-->
     <artifactId>platomix-gmetry-system-api</artifactId>
-    <version>4.1.3-20240914</version>
+    <version>4.1.5-20240920</version>
     <dependencies>
         <dependency>
             <groupId>com.platomix</groupId>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.platomix</groupId>
             <artifactId>platomix-gmetry-framework</artifactId>
-            <version>2.3.5</version>
+            <version>2.3.6</version>
         </dependency>
         <dependency>
             <groupId>com.platomix</groupId>

platomix-gmetry-system-api/src/main/java/org/springblade/modules/system/controller/FileController.java

@@ -62,7 +62,7 @@ public class FileController {
                 !".xls".equalsIgnoreCase(fileSuffix) &&
                 !".jar".equalsIgnoreCase(fileSuffix) &&
                 !".svg".equalsIgnoreCase(fileSuffix) &&
-                !".xlsx".equalsIgnoreCase(fileSuffix) ||true) {
+                !".xlsx".equalsIgnoreCase(fileSuffix) &&false) {
 
             return R.fail("只能上传jpg/jpeg/gif/png/pdf/doc/xls/jar/svg类型的文件");
         }
@@ -159,7 +159,7 @@ public class FileController {
                                                   @RequestParam(value = "fileName", required = false) String fileName,
                                                   @RequestParam(value = "fileOrgId", required = false) String fileOrgId,
                                                   @RequestParam(value = "fileOrgType", required = false) String fileOrgType,
-
+                                                  @RequestParam(value = "tenantId", required = false) String tenantId,
                                                   MultipartFile file) throws IOException {
         if (null == file) {
             return R.fail("文件不能为空");
@@ -176,7 +176,7 @@ public class FileController {
                 !".xls".equalsIgnoreCase(fileSuffix) &&
                 !".jar".equalsIgnoreCase(fileSuffix) &&
                 !".svg".equalsIgnoreCase(fileSuffix) &&
-                !".xlsx".equalsIgnoreCase(fileSuffix)||true) {
+                !".xlsx".equalsIgnoreCase(fileSuffix)&&false) {
 
             return R.fail("只能上传jpg/jpeg/gif/png/pdf/doc/xls/jar/svg类型的文件");
         }
@@ -185,7 +185,7 @@ public class FileController {
         }
 
         Date date = new Date();
-        String tenantId = AuthUtil.getTenantId();
+//        String tenantId = AuthUtil.getTenantId();
         if (StringUtils.isBlank(tenantId)) {
             tenantId = "admin";
         }