From 48d06fac940e6f28d599eb7fbf05c2cce41ecb30 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 10:35:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
index 30d8ea3..7900f83 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
@@ -151,6 +151,7 @@
.leftJoin(Member.class,Member::getId,JkIccard::getMemberId)
.eq(JkIccard::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(model.getStatus()),JkIccard::getStatus,model.getStatus())
+ .eq(Objects.nonNull(model.getUserType()),JkIccard::getUserType,model.getUserType())
.like(StringUtils.isNotBlank(model.getCode()),JkIccard::getCode,model.getCode())
.like(StringUtils.isNotBlank(model.getMemberName()),Member::getName,model.getMemberName())
.orderByDesc(JkIccard::getCreateDate)
--
Gitblit v1.9.3