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>