From 4f986140a10e71c07c7001ccbcda6e93e17736b1 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 23 四月 2024 15:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index 7ef524b..f24ba1a 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -59,19 +59,14 @@
</if>
</select>
<select id="authorizedPerson" resultType="com.yuanchu.mom.pojo.Device">
- select *
- from (select id,
- authorized_person,
- status
- from device) a
+ select id,
+ authorized_person
+ from device
</select>
<select id="search" resultType="com.yuanchu.mom.pojo.Device">
select *
from device
<where>
- <if test="status!=null">
- and status = #{status}
- </if>
<if test="deviceName!=null and deviceName!=''">
and device_name like concat('%',#{deviceName},'%')
</if>
@@ -85,7 +80,6 @@
</select>
<update id="upDeviceParameter" parameterType="com.yuanchu.mom.pojo.Device">
-
UPDATE device
<set>
<if test="largeCategory!=null and largeCategory!='' ">large_category=#{largeCategory},</if>
@@ -123,7 +117,6 @@
id=#{id}
</where>
</update>
-
<select id="selectDeviceImage" resultType="com.yuanchu.mom.pojo.Device">
select (image_upload, create_user, create_time) values (#{image_upload}
, #{createUser}
--
Gitblit v1.9.3