From 492db3b890871c5a2f61a6c751b6748d7efef725 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 8 Apr 2025 17:10:45 +0800
Subject: [PATCH] tree

---
 .../bonus/canteen/core/alloc/service/IAllocAreaService.java | 2 +-
 .../core/alloc/service/impl/AllocAreaServiceImpl.java       | 6 +++---
 .../canteen/core/{alloc => common}/domain/TreeSelect.java   | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{alloc => common}/domain/TreeSelect.java (94%)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/IAllocAreaService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/IAllocAreaService.java
index a66a17c..2e60d76 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/IAllocAreaService.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/IAllocAreaService.java
@@ -2,7 +2,7 @@ package com.bonus.canteen.core.alloc.service;
 
 import java.util.List;
 import com.bonus.canteen.core.alloc.domain.AllocArea;
-import com.bonus.canteen.core.alloc.domain.TreeSelect;
+import com.bonus.canteen.core.common.domain.TreeSelect;
 
 /**
  * 区域Service接口
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/impl/AllocAreaServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/impl/AllocAreaServiceImpl.java
index ef993c2..d849190 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/impl/AllocAreaServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/impl/AllocAreaServiceImpl.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
-import com.bonus.canteen.core.alloc.domain.TreeSelect;
+import com.bonus.canteen.core.common.domain.TreeSelect;
 import com.bonus.canteen.core.alloc.mapper.AllocAreaMapper;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
@@ -110,8 +110,8 @@ public class AllocAreaServiceImpl implements IAllocAreaService {
     @Override
     public List<TreeSelect> buildAreaTreeSelect(List<AllocArea> areas)
     {
-        List<AllocArea> deptTrees = buildAreaTree(areas);
-        return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
+        List<AllocArea> areaTrees = buildAreaTree(areas);
+        return areaTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
     @Override
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/TreeSelect.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/domain/TreeSelect.java
similarity index 94%
rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/TreeSelect.java
rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/domain/TreeSelect.java
index f725937..e6ce115 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/TreeSelect.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/domain/TreeSelect.java
@@ -1,5 +1,6 @@
-package com.bonus.canteen.core.alloc.domain;
+package com.bonus.canteen.core.common.domain;
 
+import com.bonus.canteen.core.alloc.domain.AllocArea;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import java.io.Serializable;