From 300d75d257dbe60401dfb97123ae39e32f37380e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 18:28:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
index f0e6923..1fba2a7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -108,7 +108,7 @@
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Member::getName,Empower::getMemberName);
queryWrapper.selectAs(Member::getPhone,Empower::getMemberPhone);
- queryWrapper.selectAs(Member::getIdcardNo,Empower::getMemberidCard);
+ queryWrapper.selectAs(Member::getIdcardDecode,Empower::getMemberidCard);
queryWrapper.selectAs(Company::getName,Empower::getCompanyName);
queryWrapper.selectAs(SystemUser::getUsername,Empower::getCreaterName);
queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
@@ -120,7 +120,7 @@
.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
.or().like(Member::getPhone,pageWrap.getModel().getCompanyName()));
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getSendStatus()),Empower::getSendStatus,pageWrap.getModel().getSendStatus());
- queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId());
+ queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId());
queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getSendStartDate()),Empower::getSendDate,pageWrap.getModel().getSendStartDate());
queryWrapper.le(Objects.nonNull(pageWrap.getModel().getSendEndDate()),Empower::getSendDate,pageWrap.getModel().getSendEndDate());
--
Gitblit v1.9.3