From ad7fe392f18210a193a32be5e4b9309ccf1a338a Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Tue, 29 Apr 2025 09:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java | 7 +++++++
 .../src/main/resources/mapper/android/UserMapper.xml       | 3 +--
 .../resources/mapper/device/DoubleScreenMachineMapper.xml  | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java
index 4180d49..3fa5274 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java
@@ -123,6 +123,13 @@ public class DeviceFullInfoVO {
    private Integer gateDefaultAmount;
    @ApiModelProperty("设备状态")
    private String deviceState;
+   private String recipeName;
+   private String areaName;
+   private String areaId;
+   private String canteenName;
+   private String canteenId;
+   private String stallName;
+   private String stallId;
    @ApiModelProperty("绑定关系")
    private List<DeviceBindVO> bindList;
    @ApiModelProperty("菜谱信息")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
index c0b9186..a541356 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_user su
         left join acc_card ac on ac.user_id = su.user_id
         left join acc_info ai on ai.user_id = su.user_id
-        <where>
+        where ai.del_flag = '2'
             <if test="type == 'user'">
                 <if test="time != null and time != ''">
                     AND su.update_time >= #{time} - INTERVAL 5 SECOND;
@@ -31,7 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null and userId != '' and userId != 0 and userId != '0'">
                 AND su.user_id = #{userId}
             </if>
-        </where>
     </select>
     <select id="getMoneyList" resultType="com.bonus.canteen.core.android.vo.UserInfoVo">
         SELECT
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml
index 2bdf54d..3dd0fd7 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml
@@ -148,9 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="checkIsExist" resultType="java.lang.Integer">
         select count(1)
         from device_info
-        where (device_num like concat('%', #{keyWord}, '%')
-            or device_name like concat('%', #{keyWord}, '%')
-            or device_sn like concat('%', #{keyWord}, '%'))
+        where (device_num = #{keyWord}
+            or device_name = #{keyWord}
+            or device_sn = #{keyWord})
         <if test="deviceId != null and deviceId != ''">
             and device_id != #{deviceId}
         </if>