From 2d95605efd098e1b1c80f80021b259314b10f204 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 01 三月 2024 10:41:14 +0800
Subject: [PATCH] ERP接口

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 d75a56b..1fd3fbf 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,18 +108,20 @@
         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);
         queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
         queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Empower::getCreator);
 
-        queryWrapper.eq(Empower::getIsdeleted, Constants.ZERO)
+        queryWrapper
+               /* .eq(Empower::getIsdeleted, Constants.ZERO)*/
                 .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
-                .or().like(Member::getPhone,pageWrap.getModel().getCompanyName()));
+                .or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
         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.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
         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