Merge branch 'dev-lx' into 'dev'

feat: 房源

See merge request !124

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

@@ -163,19 +163,11 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     private List<HouseResourcePage> handleHouseList(List<HouseResourcePage> list) {
         list.forEach(x -> {
-            GridRegionExample gridRegionExample = new GridRegionExample();
-            gridRegionExample.createCriteria().andWgCodeEqualTo(x.getTwo()).andWgTypeEqualTo(String.valueOf(x.getType()));
-            List<GridRegion> two = gridRegionMapper.selectByExample(gridRegionExample);
-            if (!two.isEmpty()) {
-                x.setWgName2(two.get(0).getWgName());
-            }
+            GridRegion two = gridRegionMapper.selectByPrimaryKey(x.getTwo());
+            x.setWgName2(two.getWgName());
 
-            GridRegionExample gridRegionExampleThree = new GridRegionExample();
-            gridRegionExampleThree.createCriteria().andWgCodeEqualTo(x.getThree()).andWgTypeEqualTo(String.valueOf(x.getType()));
-            List<GridRegion> three = gridRegionMapper.selectByExample(gridRegionExampleThree);
-            if (!three.isEmpty()) {
-                x.setWgName3(three.get(0).getWgName());
-            }
+            GridRegion three = gridRegionMapper.selectByPrimaryKey(x.getThree());
+            x.setWgName3(three.getWgName());
             x.setHouseResourceAttributeText(HouseEnums.HouseResourceAttributeEnum.getDescByCode(x.getHouseResourceAttribute()));
             x.setHouseResourceTypeText(HouseEnums.HouseResourceTypeEnum.getDescByCode(x.getHouseResourceType()));
             x.setOrientationText(HouseEnums.OrientationEnum.getDescByCode(x.getOrientation()));

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

@@ -116,7 +116,7 @@
         t2.*
         FROM
         grid_region t1
-        LEFT JOIN house_resource t2 ON t1.wg_code = t2.four
+        LEFT JOIN house_resource t2 ON t1.id = t2.four
         <where>
             <if test="query.wgType != null">
                 and t2.type = #{query.wgType}
@@ -150,7 +150,7 @@
         t2.*
         FROM
         grid_region t1
-        LEFT JOIN house_resource t2 ON t1.wg_code = t2.four
+        LEFT JOIN house_resource t2 ON t1.id = t2.four
         <where>
             <if test="query.wgType != null">
                 and t2.type = #{query.wgType}