From 9ec9513a3c5f9c759c784063ad7877aa2cb43a8c Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Tue, 15 Mar 2022 11:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E5=8C=85=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=92=8C=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xhpc/XhpcWorkOrderApplication.java     | 4 ----
 .../src/main/resources/mapper/XhpcStationDeviceMapper.xml    | 5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/XhpcWorkOrderApplication.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/XhpcWorkOrderApplication.java
index 6a0d9c03..1d8a3edb 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/XhpcWorkOrderApplication.java
+++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/XhpcWorkOrderApplication.java
@@ -5,13 +5,9 @@ import com.xhpc.common.security.annotation.EnableRyFeignClients;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 
-@EnableConfigurationProperties
-@ConfigurationPropertiesScan(basePackages = {"com.xhpc.workorder.config"})
 @EnableCustomConfig
 @EnableRyFeignClients
 @EnableFeignClients
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
index 45bf4e9c..754ea873 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
+++ b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
@@ -53,7 +53,7 @@
     LEFT JOIN xhpc_work_station s on s.work_station_id=d1.station_id
     LEFT JOIN xhpc_station_device d2 on d2.parent_device_id=d1.device_id
     LEFT JOIN xhpc_terminal t on t.serial_number = d2.serial_number
-    WHERE s.del_flag=0 and d1.del_flag=0 and d1.device_type='PILE'
+    WHERE s.del_flag=0 and d1.del_flag=0 and d2.del_flag=0 and d1.device_type='PILE'
     <if test="params.stationName!=null and params.stationName != ''">
       and s.name like concat('%', #{params.stationName}, '%')
     </if>
@@ -66,7 +66,8 @@
     <if test="params.tenantId!=null and params.tenantId!=''">
       and s.tenant_id=#{params.tenantId}
     </if>
-    order by d1.device_type, d1.sorted, d2.device_type, d2.sorted
+    GROUP BY d2.device_id
+    order by s.work_station_id, d1.device_type,d1.device_id, d1.sorted, d2.device_type,d2.device_id, d2.sorted
   </select>