From 6525935588f4b9a06e08f91dfc9d2895e5ec2c38 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 11:00:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 d2b5382..2408fa3 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
@@ -164,10 +164,16 @@
@Override
public List<JkKeys> findList(JkKeys jkKeys) {
+
+
+
+
jkKeys.setIsdeleted(Constants.ZERO);
- jkKeys.setStatus(Constants.ZERO);
QueryWrapper<JkKeys> wrapper = new QueryWrapper<>(jkKeys);
- return jkKeysMapper.selectList(wrapper);
+ return jkKeysMapper.selectList(new QueryWrapper<JkKeys>()
+ .lambda().eq(JkKeys::getIsdeleted,Constants.ZERO)
+
+ );
}
@Override
@@ -184,6 +190,7 @@
.leftJoin(JkCabinetGrid.class,JkCabinetGrid::getKeyId,JkKeys::getId)
.leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
.eq(JkKeys::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