From 64ef9d6c785f14cef2feb00893be10c43a88b323 Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Mon, 9 Sep 2024 13:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/approver/impl/ApproverAbstractServiceImpl.java | 2 +- .../service/approver/impl/PublicApproverServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java index 099225f..f3706d7 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java @@ -92,7 +92,7 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService { QueryWrapper lqw = Wrappers.query().eq("app.business_type",approverType()) .eq(bo.getId()!=null,"app.id",bo.getId()) .eq("app.del_flag","0") - .like(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus()) + .eq(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus()) .like(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName()) .like(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName()) //销售经理姓名 diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PublicApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PublicApproverServiceImpl.java index 0004234..523c644 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PublicApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PublicApproverServiceImpl.java @@ -22,6 +22,7 @@ import com.pusong.business.mapper.PsContractPayMapper; import com.pusong.business.mapper.PsCustomInfoMapper; import com.pusong.common.core.service.UserService; import com.pusong.common.core.utils.DateUtils; +import com.pusong.common.core.utils.StringUtils; import com.pusong.common.mybatis.core.page.PageQuery; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; @@ -85,6 +86,10 @@ public class PublicApproverServiceImpl extends ApproverAbstractServiceImpl { public Page queryList(PsApproverRecordBo bo, PageQuery pageQuery){ QueryWrapper lqw = Wrappers.query().eq("app.business_type",approverType()) .eq(bo.getId()!=null,"app.id",bo.getId()) + .like(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName()) + .exists(StringUtils.isNotBlank(bo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = app.update_data and su.nick_name like '%" + bo.getCustomManagerName() + "%'") + .exists(StringUtils.isNotBlank(bo.getCompanyName()),"select 1 from ps_company_info com where cus.id = com.custom_id and com.company_name like '%" + bo.getCompanyName() + "%'") + .eq(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus()) .orderByAsc("app.approver_status").orderByAsc("app.approver_date");; Page res = recordMapper.selectPagePublicList(pageQuery.build(), lqw); if(CollectionUtils.isEmpty(res.getRecords())){