From bd64b0f69d8e9a29976de799e7fdddf5e53eda25 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Wed, 21 May 2025 17:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=BA=E5=8D=A1=E5=BA=A7=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/framework/util/DataScopeUtil.java   | 2 +-
 .../main/java/com/ruoyi/bst/booth/domain/BoothQuery.java    | 3 +++
 .../main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml    | 1 +
 .../main/java/com/ruoyi/bst/booth/service/BoothService.java | 2 ++
 .../com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java  | 6 ++++++
 .../src/main/java/com/ruoyi/web/bst/BoothController.java    | 2 +-
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java b/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java
index 62cfec5..4670428 100644
--- a/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java
+++ b/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java
@@ -91,7 +91,7 @@ public class DataScopeUtil {
             }
             // 全部数据范围
             if (DataScopeConstants.DATA_SCOPE_ALL.equals(dataScope)) {
-                sqlString = new StringBuilder();
+                sqlString = new StringBuilder(" OR 1=1 ");
                 conditions.add(dataScope);
                 break;
             }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/domain/BoothQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/domain/BoothQuery.java
index 2110c33..22ca797 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/domain/BoothQuery.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/domain/BoothQuery.java
@@ -15,4 +15,7 @@ public class BoothQuery extends BoothVO {
     @ApiModelProperty("当前时间")
     private LocalDateTime time;
 
+    @ApiModelProperty("父分区ID")
+    private Long partParentId;
+
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml
index c4f562a..97a85d1 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml
@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.picture != null  and query.picture != ''"> and bb.picture = #{query.picture}</if>
         <if test="query.partName != null  and query.partName != ''"> and bp.part_name like concat('%', #{query.partName}, '%') </if>
         <if test="query.time != null"> and bb.expired_time &gt;= #{query.time} </if>
+        <if test="query.partParentId != null"> and bp_parent.part_id = #{query.partParentId} OR bp.part_id = #{query.partParentId} </if>
         <if test="query.storeName != null  and query.storeName != ''"> and bs.store_name like concat('%', #{query.storeName}, '%') </if>
         ${@com.ruoyi.framework.util.DataScopeUtil@create(query.scope)
         .userSetAlias("bs.user_id")
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/BoothService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/BoothService.java
index 97512b0..88526da 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/BoothService.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/BoothService.java
@@ -97,4 +97,6 @@ public interface BoothService
     int unbindUser(BoothVO booth);
 
     int userChangeBind(Long usingBoothId ,Long changeBoothId,Long userId);
+
+    List<Long> selectChildrenIds(BoothQuery query);
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java
index df287c7..b08ff50 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.bst.booth.service.impl;
 
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -261,6 +262,11 @@ public class BoothServiceImpl implements BoothService {
         }
     }
 
+    @Override
+    public List<Long> selectChildrenIds(BoothQuery query) {
+        return Collections.emptyList();
+    }
+
 
     @Override
     public DeviceIotVO lighting(BoothVO booth, Long userId, boolean requiredIot) {
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/BoothController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/BoothController.java
index f3bd7dd..5c65550 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/BoothController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/BoothController.java
@@ -61,7 +61,7 @@ public class BoothController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('bst:booth:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BoothQuery query) {
+    public TableDataInfo list(BoothQuery query,boolean needChildren) {
         startPage();
         startOrderBy();
         query.setScope(true);