From 4248fbfb4f6a43cbb4884523f599d7719d1ba1c6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 13:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
index 9f2e545..1f668c0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
@@ -121,7 +121,9 @@
InoutRecord model = pageWrap.getModel();
queryWrapper.selectAll(InoutRecord.class)
.eq(InoutRecord::getIsdeleted,Constants.ZERO)
- .eq(Objects.nonNull(model.getType()),InoutRecord::getType, model.getType())
+// .eq(Objects.nonNull(model.getType()),InoutRecord::getType, model.getType())
+ .isNotNull(Objects.nonNull(model.getType())&&Constants.equalsInteger(model.getType(),Constants.ZERO),model.getCarCode())
+ .isNotNull(Objects.nonNull(model.getType())&&Constants.equalsInteger(model.getType(),Constants.ONE),model.getMemberPhone())
.eq(Objects.nonNull(model.getInOrOut()),InoutRecord::getInOrOut, model.getInOrOut())
.eq(Objects.nonNull(model.getObjType()),InoutRecord::getObjType, model.getObjType())
.eq(Objects.nonNull(model.getCarBizType()),InoutRecord::getCarBizType, model.getCarBizType())
--
Gitblit v1.9.3