From 75ac3d5acdd448f063a3c307b4c733e37b4fc04f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 08 二月 2025 18:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/company/src/main/java/com/doumee/api/common/PublicController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/common/PublicController.java b/server/company/src/main/java/com/doumee/api/common/PublicController.java
index 179aca8..10c9278 100644
--- a/server/company/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/company/src/main/java/com/doumee/api/common/PublicController.java
@@ -76,9 +76,10 @@
             MultipartFile file = multipartRequest.getFile(fileNames.next());
             String fileName = file.getOriginalFilename();
             String suffix = fileName.substring(fileName.lastIndexOf("."));
-            if ( !StringUtils.equalsIgnoreCase(suffix, ".jpg") || !StringUtils.equalsIgnoreCase(suffix, ".png")) {
+            if ( !StringUtils.equalsIgnoreCase(suffix, ".jpg") && !StringUtils.equalsIgnoreCase(suffix, ".png")) {
                 context.put("code", 0);
                 context.put("message", "瀵逛笉璧凤紝鏂囦欢鏍煎紡涓婁紶鏈夎锛�");
+                return;
             }
         }
         upload(multipartRequest, response, folder + "/",

--
Gitblit v1.9.3