From 882dfd0933349082b48b59a97873df54f7da72d5 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Wed, 14 May 2025 15:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E6=96=B0=E5=A2=9E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E9=87=8D=E5=A4=8D=E8=8F=9C=E5=93=81=E5=92=8C?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=88=A4=E6=96=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menu/controller/MenuRecipeController.java |  5 ++++-
 .../mapper/menu/MenuDishesMapper.xml          | 21 +++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java
index 12f45ff..b9d93e0 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuRecipeController.java
@@ -193,7 +193,10 @@ public class MenuRecipeController extends BaseController {
             return ObjectUtil.isNull(excel) ? AjaxResult.error("请选择导入文件 ^_^") :
                     AjaxResult.success(this.menuRecipeService.recipeImportDishes(excel, recipeId));
         }catch (Exception e){
-            throw new ServiceException(e.toString());
+            String message = e.toString();
+            //取倒数第二个：之后的信息
+            String finalMessage = message.substring(message.lastIndexOf(":") - 7);
+            throw new ServiceException(finalMessage.replace("Error：", ""));
         }
     }
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
index 28284e7..9497905 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
@@ -401,15 +401,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getOneByName" parameterType="com.bonus.canteen.core.menu.dto.MenuDishesDTO" resultMap="MenuDishesResult">
-        select * from menu_dishes where  area_id = #{areaId}  and (
-        dishes_name = #{dishesName}
-        ) limit 1
+        select * from menu_dishes
+        where 1 = 1
+        <if test="areaId != null and areaId != ''">
+           and area_id = #{areaId}
+        </if>
+        and (dishes_name = #{dishesName})
+        <if test="dishesId != null and dishesId != ''">
+            and dishes_id != #{dishesId}
+        </if>
+        limit 1
     </select>
 
     <select id="getOneByNum" parameterType="com.bonus.canteen.core.menu.dto.MenuDishesDTO" resultMap="MenuDishesResult">
-        select * from menu_dishes where  area_id = #{areaId}
+        select * from menu_dishes where 1 = 1
+        <if test="areaId != null and areaId != ''">
+            and area_id = #{areaId}
+        </if>
         <if test="dishesNum !=null and dishesNum !=''">
             and dishes_num =#{dishesNum}
+        </if>
+        <if test="dishesId != null and dishesId != ''">
+            and dishes_id != #{dishesId}
         </if>
           limit 1
     </select>