From d5e01405a50c89966ae06363b09fd385b47f99f0 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 24 十月 2025 16:47:55 +0800
Subject: [PATCH] 问题修改

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
index 2408fa3..2082dc5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
@@ -184,13 +184,13 @@
         JkKeys model = pageWrap.getModel();
         MPJLambdaWrapper<JkKeys> wrapper = new MPJLambdaWrapper<JkKeys>()
                 .selectAll(JkKeys.class)
-                .selectAs(JkCabinetGrid::getCode,JkKeys::getGridCode)
-                .selectAs(JkCabinet::getName,JkKeys::getCabinetName)
+                .select("j.code",JkKeys::getGridCode)
+                .select("j1.name",JkKeys::getCabinetName)
                 .leftJoin(Cars.class,Cars::getId,JkKeys::getCarId)
-                .leftJoin(JkCabinetGrid.class,JkCabinetGrid::getKeyId,JkKeys::getId)
-                .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
+                .leftJoin(" jk_cabinet_grid j on j.key_id = t.id and j.isdeleted = 0  ")
+                .leftJoin(" jk_cabinet j1 on j.CABINET_ID = j1.id ")
                 .eq(JkKeys::getIsdeleted,Constants.ZERO)
-                .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
+//                .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
                 .like(StringUtils.isNotBlank(model.getCode()),JkKeys::getCode,model.getCode())
                 .like(StringUtils.isNotBlank(model.getCarCode()),JkKeys::getCarCode,model.getCode());
         IPage<JkKeys> iPage = jkKeysMapper.selectJoinPage(page,JkKeys.class,wrapper);

--
Gitblit v1.9.3