From 810b07cd238377e7a18e523cfe2094d8a3272ab8 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期日, 24 十二月 2023 23:03:36 +0800
Subject: [PATCH] 配置信息对接调整提交

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index b45d0bb..7299819 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -115,9 +115,12 @@
         IPage<ProblemLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<ProblemLog> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
-        queryWrapper.leftJoin(Member.class,Member::getOpenid,ProblemLog::getOpenid);
+        queryWrapper.leftJoin(Member.class,Member::getId,ProblemLog::getUserId);
         queryWrapper.selectAll(ProblemLog.class)
-                .selectAs(Member::getType,ProblemLog::getType);
+                .selectAs(Member::getType,ProblemLog::getType)
+                .like(StringUtils.isNotBlank(pageWrap.getModel().getName()), ProblemLog::getName, pageWrap.getModel().getName())
+                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ProblemLog::getCompanyName, pageWrap.getModel().getCompanyName())
+                .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, pageWrap.getModel().getType());
         queryWrapper.orderByDesc(ProblemLog::getCreateDate);
         IPage<ProblemLog> problemLogIPage = problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper);
         System.out.println(problemLogIPage);

--
Gitblit v1.9.3