Merge branch 'dev'

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePageQuery.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -36,4 +37,6 @@ public class HouseResourcePageQuery extends PageDomain {
     private BigDecimal yearSellMin;
 
     private BigDecimal yearSellMax;
+
+    private List<String> wgCodes;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -2,14 +2,18 @@ package com.ruoyi.system.service.house.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.grid.GridRegion;
 import com.ruoyi.system.domain.grid.GridRegionExample;
+import com.ruoyi.system.domain.grid.GridRegionUser;
+import com.ruoyi.system.domain.grid.GridRegionUserExample;
 import com.ruoyi.system.domain.house.BusinessEntityInfo;
 import com.ruoyi.system.domain.house.BusinessEntitySell;
 import com.ruoyi.system.domain.house.HouseResource;
 import com.ruoyi.system.domain.house.enums.HouseEnums;
 import com.ruoyi.system.domain.house.vo.*;
 import com.ruoyi.system.mapper.grid.GridRegionMapper;
+import com.ruoyi.system.mapper.grid.GridRegionUserMapper;
 import com.ruoyi.system.mapper.house.BusinessEntityInfoMapper;
 import com.ruoyi.system.mapper.house.BusinessEntitySellMapper;
 import com.ruoyi.system.mapper.house.HouseResourceMapper;
@@ -35,11 +39,14 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     private final GridRegionMapper gridRegionMapper;
 
-    public HouseResourceServiceImpl(HouseResourceMapper houseResourceMapper, BusinessEntityInfoMapper businessEntityInfoMapper, BusinessEntitySellMapper businessEntitySellMapper, GridRegionMapper gridRegionMapper) {
+    private final GridRegionUserMapper gridRegionUserMapper;
+
+    public HouseResourceServiceImpl(HouseResourceMapper houseResourceMapper, BusinessEntityInfoMapper businessEntityInfoMapper, BusinessEntitySellMapper businessEntitySellMapper, GridRegionMapper gridRegionMapper, GridRegionUserMapper gridRegionUserMapper) {
         this.houseResourceMapper = houseResourceMapper;
         this.businessEntityInfoMapper = businessEntityInfoMapper;
         this.businessEntitySellMapper = businessEntitySellMapper;
         this.gridRegionMapper = gridRegionMapper;
+        this.gridRegionUserMapper = gridRegionUserMapper;
     }
 
     @Override
@@ -153,6 +160,15 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     @Override
     public IPage<HouseResourcePage> pageHouseResources(HouseResourcePageQuery query) {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        GridRegionUserExample example = new GridRegionUserExample();
+        GridRegionUserExample.Criteria criteria = example.createCriteria();
+        criteria.andIsValidEqualTo("1");
+        criteria.andUserIdEqualTo(userId);
+        List<GridRegionUser> gridRegionUsers = gridRegionUserMapper.selectByExample(example);
+        if (!CollectionUtils.isEmpty(gridRegionUsers)) {
+            query.setWgCodes(gridRegionUsers.stream().map(GridRegionUser::getWgId).collect(Collectors.toList()));
+        }
         IPage<HouseResourcePage> page = houseResourceMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()), query);
         List<HouseResourcePage> records = handleHouseList(page.getRecords());
         page.setRecords(records);
@@ -306,7 +322,24 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                 }
             }
         } else {
-            result = list;
+            String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+            GridRegionUserExample example = new GridRegionUserExample();
+            GridRegionUserExample.Criteria criteria = example.createCriteria();
+            criteria.andIsValidEqualTo("1");
+            criteria.andUserIdEqualTo(userId);
+            List<GridRegionUser> gridRegionUsers = gridRegionUserMapper.selectByExample(example);
+            if (!CollectionUtils.isEmpty(gridRegionUsers)) {
+                List<String> twos = gridRegionUsers.stream().map(GridRegionUser::getWgId).collect(Collectors.toList());
+                for (String two : twos) {
+                    for (HouseResource houseResource : list) {
+                        if (two.equals(houseResource.getTwo())) {
+                            result.add(houseResource);
+                        }
+                    }
+                }
+            } else {
+                result = list;
+            }
         }
         if (CollectionUtils.isEmpty(result)) {
             return new PageBusinessEntityStatisticsDetail();

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -155,6 +155,12 @@
             <if test="query.yearSellMin != null and query.yearSellMin != '' and query.yearSellMax != null and query.yearSellMax != ''">
                 and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
+            <if test="query.wgCodes != null and query.wgCodes.size() > 0">
+                and t1.two in
+                <foreach item="item" index="index" collection="query.wgCodes" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY t1.id
     </select>