From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java
index f9f2089..e894a39 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java
@@ -87,7 +87,7 @@
QueryWrapper<CompanyLog> wrapper = new QueryWrapper<>(companyLog);
return companyLogMapper.selectList(wrapper);
}
-
+
@Override
public PageData<CompanyLog> findPage(PageWrap<CompanyLog> pageWrap) {
IPage<CompanyLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -123,7 +123,12 @@
IPage<CompanyLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
Utils.MP.blankToNull(pageWrap.getModel());
- return PageData.from(companyLogExtMapper.selectPage(page, pageWrap.getModel().getCompanyName(),pageWrap.getModel().getUpdateType()));
+ IPage<CompanyLog> companyLogIPage = companyLogExtMapper.selectPage(page, pageWrap.getModel().getUserName(), pageWrap.getModel().getUpdateType());
+
+ if (!CollectionUtils.isEmpty(companyLogIPage.getRecords())){
+ companyLogIPage.getRecords().forEach(s->s.setShortName(s.getCompanyName()));
+ }
+ return PageData.from(companyLogIPage);
}
@Override
--
Gitblit v1.9.3