Merge branch 'dev-lx' into 'dev'

Dev lx

See merge request !71

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

@@ -11,6 +11,7 @@ import com.ruoyi.system.service.house.HouseResourceAssociationObjectService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
@@ -51,8 +52,8 @@ public class HouseResourceAssociationObjectServiceImpl implements HouseResourceA
     @Override
     public HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type) {
         List<HouseResourceAssociationObject> houseResourceAssociationObject = houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationByHouseResourceIdType(houseResourceId, type);
-        if (Objects.isNull(houseResourceAssociationObject)) {
-            return null;
+        if (CollectionUtils.isEmpty(houseResourceAssociationObject)) {
+            return new HouseResourceAssociationObjectVo();
         }
         List<GridCompany> gridCompanyList = new ArrayList<>();
         List<GridShop> gridShopList = new ArrayList<>();

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

@@ -41,6 +41,6 @@
 
     <select id="selectHouseResourceObjectAssociationByHouseResourceIdType"
             resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
-        SELECT id, type, house_resource_id, business_id  WHERE house_resource_id = #{houseResourceId} and type = #{type}
+        SELECT id, type, house_resource_id, business_id from house_resource_association_object  WHERE house_resource_id = #{houseResourceId} and type = #{type}
     </select>
 </mapper>
\ No newline at end of file