From 7223d7062bb7898725fd4de87b7b6e0a1bb949e4 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 11 Apr 2025 14:57:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87=E3=80=81?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/base/basic/domain/vo/DeviceVo.java    | 4 ++--
 .../src/main/resources/mapper/smartsite/basic/DevMapper.xml   | 1 +
 .../src/main/resources/mapper/smartsite/basic/UnitMapper.xml  | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java
index fe9a603..24bc7ff 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/DeviceVo.java
@@ -80,13 +80,13 @@ public class DeviceVo {
      * 创建时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     /**
      * 修改时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
     /**
      * 备注
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml
index 78b4ebf..a437c2a 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/DevMapper.xml
@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             AND td.is_active = '1'
         </where>
+        ORDER BY td.update_time DESC
     </select>
     <!--查询数据是否重复-共用同一个puid的视频设备-->
     <select id="queryValueIsExist2" resultType="java.lang.Integer">
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml
index 3c19dee..89d9054 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/UnitMapper.xml
@@ -84,6 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     INSTR(suff_phone,#{keyWord}) > 0
                 )
             </if>
+            <if test="unitType!=null and unitType!=''">
+                AND unit_type =#{unitType}
+            </if>
             AND is_active = '1'
         </where>
     </select>