Merge branch 'dev' into 'main'

Dev

See merge request !37

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

@@ -13,6 +13,7 @@ import com.ruoyi.system.mapper.house.HouseResourceMapper;
 import com.ruoyi.system.service.house.HouseResourceService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.util.*;
 
@@ -84,7 +85,9 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     public IPage<HouseResourcePage> pageHouseResources(HouseResourcePageQuery query) {
         IPage<HouseResourcePage> page = houseResourceMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()), query);
         page.getRecords().forEach(x -> {
-            x.setHouseResourceUrlList(Arrays.asList(x.getHouseResourceUrl().split(",")));
+            if (StringUtils.hasText(x.getHouseResourceUrl())) {
+                x.setHouseResourceUrlList(Arrays.asList(x.getHouseResourceUrl().split(",")));
+            }
             x.setHouseResourceAttributeText(HouseEnums.HouseResourceAttributeEnum.getDescByCode(x.getHouseResourceAttribute()));
             x.setHouseResourceTypeText(HouseEnums.HouseResourceTypeEnum.getDescByCode(x.getHouseResourceType()));
             x.setOrientationText(HouseEnums.OrientationEnum.getDescByCode(x.getOrientation()));