Merge branch 'dev' into 'main'

Dev

See merge request !88

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceAssociationObjectController.java

@@ -34,7 +34,7 @@ public class HouseResourceAssociationObjectController {
     }
 
     @GetMapping("/detail")
-    public AjaxResult getHouseResourceAssociationObjectDetail(@RequestParam String houseResourceId) {
+        public AjaxResult getHouseResourceAssociationObjectDetail(@RequestParam String houseResourceId) {
         return AjaxResult.success(houseResourceAssociationObjectService.queryHouseResourceAssociationObjectByHouseResourceIdType(houseResourceId));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java

@@ -32,8 +32,7 @@ public class HouseResourceController {
 
     @PutMapping
     public AjaxResult updateHouseResource(@RequestBody HouseResourceSaveUpdateDto dto) {
-        houseResourceService.updateHouseResource(dto);
-        return AjaxResult.success();
+        return houseResourceService.updateHouseResource(dto);
     }
 
     @DeleteMapping

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceService.java

 package com.ruoyi.system.service.house;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.house.HouseResource;
 import com.ruoyi.system.domain.house.vo.HouseResourceDetail;
 import com.ruoyi.system.domain.house.vo.HouseResourcePage;
@@ -15,7 +16,7 @@ public interface HouseResourceService {
 
     HouseResourceDetail queryHouseResourceById(String id);
 
-    void updateHouseResource(HouseResourceSaveUpdateDto dto);
+    AjaxResult updateHouseResource(HouseResourceSaveUpdateDto dto);
 
     void deleteHouseResourceById(String id);
 

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

@@ -121,7 +121,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateHouseResource(HouseResourceSaveUpdateDto dto) {
+    public AjaxResult updateHouseResource(HouseResourceSaveUpdateDto dto) {
         if (Objects.isNull(dto.getHouseResource().getId())) {
             throw new RuntimeException("房源id不能为空");
         }
@@ -160,6 +160,8 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                     houseResourceAssociationObject.setBusinessId(id);
                     houseResourceAssociationObject.setType(2);
                     houseResourceAssociationObjectMapper.insertHouseResourceObjectAssociation(houseResourceAssociationObject);
+                } else {
+                    return result;
                 }
             } else {
                 try {
@@ -169,6 +171,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                 }
             }
         }
+        return AjaxResult.success();
     }
 
     @Override