Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 a1d8ea1a72cddf7651742b87f042602ab006c879

 src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseRentalEntity;
import org.springblade.modules.house.entity.HouseTenantEntity;
import org.springblade.modules.house.service.IHouseTenantService;
@@ -51,6 +52,9 @@
   @Autowired
   private IHouseTenantService houseTenantService;

   @Autowired
   private IGridService gridService;

   /**
    * 自定义分页查询
    * @param page
@@ -59,7 +63,14 @@
    */
   @Override
   public IPage<HouseRentalTenantVO> selectHouseRentalPage(IPage<HouseRentalTenantVO> page, HouseRentalTenantVO houseRental) {
      return page.setRecords(baseMapper.selectHouseRentalPage(page, houseRental));
      List<String> list = new ArrayList<>();
      if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
         if (houseRental.getRoleName().equals("网格员")){
            // 查询对应的房屋地址code
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         }
      }
      return page.setRecords(baseMapper.selectHouseRentalPage(page, houseRental,list));
   }

   /**
@@ -196,8 +207,15 @@
    */
   @Override
   public Object getStatistics(HouseRentalTenantVO houseRental) {
      List<String> list = new ArrayList<>();
      if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
         if (houseRental.getRoleName().equals("网格员")){
            // 查询对应的房屋地址code
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         }
      }
      // 查询
      List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental);
      List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental,list);
      // 返回
      return statistics;
   }