Merge branch 'dev' into 'main'

Dev

See merge request !207

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -872,10 +872,10 @@ public class RegionController extends BaseController {
         GridRegionExample.Criteria criteria1 = example1.createCriteria();
         criteria1.andIsValidEqualTo("1");
         criteria1.andWgParentIdEqualTo(wgCode);
-        long count = gridRegionMapper.countByExample(example1);
-        if(count>0){
-            throw new RuntimeException("当前菜单存在下级菜单，无法删除");
-        }
+//        long count = gridRegionMapper.countByExample(example1);
+//        if(count>0){
+//            throw new RuntimeException("当前菜单存在下级菜单，无法删除");
+//        }
         if(gridRegionMapper.countByFourthCode(wgCode)>0){
             throw new RuntimeException("当前菜单存在房源，无法删除");
         }
@@ -886,7 +886,10 @@ public class RegionController extends BaseController {
         criteria.andIsValidEqualTo("1");
         criteria.andIdEqualTo(id);
 
-        return AjaxResult.success(gridRegionMapper.deleteByExample(example));
+        gridRegionMapper.deleteByExample(example);
+        gridRegionMapper.deleteByExample(example1);
+
+        return AjaxResult.success();
     }
 
     @RequestMapping(value = "/changeName",method = RequestMethod.GET)

ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml

@@ -781,7 +781,7 @@
 
   <select id="countByFourthCode" resultType="Integer">
     select count(*) from house_resource
-    where four = #{code}
+    where four = #{code} or three = #{code}
   </select>
 
 </mapper>