From 7dd3b94487224e57e4de6b74ee9d5f24fd08b425 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 17:55:51 +0800
Subject: [PATCH] 文章bug修复
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index a15ffa4..f8b7a33 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -26,7 +26,6 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
@@ -468,13 +467,27 @@
List<HouseholdVO> householdVOS = baseMapper.selectHouseholdList(household);
// 遍历
for (HouseholdVO householdVO : householdVOS) {
- if (householdVO.getHouseholdLabelList().size()>0){
+ if (householdVO.getHouseholdLabelList().size() > 0) {
List<String> labelNameList = householdVO.getHouseholdLabelList().stream().map(householdLabelVO -> householdLabelVO.getLabelName())
.collect(Collectors.toList());
- householdVO.setLabelName(String.join(",",labelNameList));
+ householdVO.setLabelName(String.join(",", labelNameList));
}
}
// 返回
- return householdVOS;
+ return householdVOS;
+ }
+
+ @Override
+ public IPage<HouseholdVO> getKeynotePersonnelPage(IPage<HouseholdVO> page, HouseholdVO household) {
+ StopWatch stopWatch = new StopWatch();
+ stopWatch.start();
+// Dept dept = deptService.getById(AuthUtil.getDeptId());
+// if (null!=dept){
+// household.setRegionCode(dept.getRegionCode());
+// }
+ List<HouseholdVO> householdVOS = baseMapper.getKeynotePersonnelPage(page, household);
+ stopWatch.stop();
+ System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
+ return page.setRecords(householdVOS);
}
}
--
Gitblit v1.9.3