文章bug修复

linwei

2024-01-10 7dd3b94487224e57e4de6b74ee9d5f24fd08b425

 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);
   }
}