From 1a24e1c9d8d763efa41298f7dd1156e0c10e5032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 18 Dec 2024 14:46:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=9E=9B=E4=BD=8D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=94=B1=E4=BA=8E=E6=B2=A1=E6=9C=89=E6=9D=BF=E6=9D=90?=
 =?UTF-8?q?=E6=97=B6=E5=9E=9B=E4=BD=8D=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA,=E6=98=BE=E7=A4=BA=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E7=BB=93=E6=9E=9C=203.=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=B8=8A=E6=96=99=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F,=E4=BD=BF=E7=94=A8=E5=B7=A5=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java   | 1 +
 src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java   | 1 +
 src/main/resources/mappers/zyjh/YcldwMapper.xml                | 3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
index cdebcfe..207191a 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
@@ -415,6 +415,7 @@ public class ZyjhController {
                 .eq(StrUtil.isNotEmpty(search.getDcch()),DmYdjh::getDcCh, search.getDcch())
                 .eq(StrUtil.isNotEmpty(search.getDcPl()),DmYdjh::getDcPl, search.getDcPl())
                 .eq(StrUtil.isNotEmpty(search.getKw()),DmYdjh::getKw, search.getKw())
+                .orderByDesc(DmYdjh::getDjh)
 
         );
         return new ResultBean<>(list);
diff --git a/src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java b/src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java
index fb46991..8db6be4 100644
--- a/src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java
+++ b/src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java
@@ -125,6 +125,7 @@ public class WebSocketService extends TextWebSocketHandler {
             case ERROR:
                 tipHandler.execute(msg);
             case ZX:
+                tipHandler.execute(msg);
                 zxHandler.execute(msg);
                 break;
         }
diff --git a/src/main/resources/mappers/zyjh/YcldwMapper.xml b/src/main/resources/mappers/zyjh/YcldwMapper.xml
index 2601054..f026c70 100644
--- a/src/main/resources/mappers/zyjh/YcldwMapper.xml
+++ b/src/main/resources/mappers/zyjh/YcldwMapper.xml
@@ -43,10 +43,9 @@
             a.id,a.name,a.type,a.tzbh,
             <include refid="ycldwInfo" />
         from
-            ycldw a left join ycldw_info b on a.id=b.dw_id
+            ycldw a left join ycldw_info b on a.id=b.dw_id <if test="lx!=null and lx!=''">AND b.zt=#{lx}</if>
         <where>
             <if test="type!=null and type!=''">a.type = #{type}</if>
-            <if test="lx!=null and lx!=''">AND b.zt=#{lx}</if>
         </where>
         order by a.id,ceng
     </select>