From 0a14a5e77af0a481ffa454f4e7899f3065e8464b Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Fri, 14 Mar 2025 13:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=20mgr=5Frole=5Fcanteen=20?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=BA=20sys=5Frole=5Fcanteen=20=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=20mgr=5Frole=5Fwarehouse=20=E8=A1=A8=E4=B8=BA=20sys=5Frole=5Fw?=
 =?UTF-8?q?arehouse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AllocCanteenServiceImpl.java      |  2 +-
 .../bonus/canteen/core/auth/api/MgrAuthApi.java    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocCanteenServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocCanteenServiceImpl.java
index 8036a3ad..a09200d6 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocCanteenServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocCanteenServiceImpl.java
@@ -207,7 +207,7 @@ public class AllocCanteenServiceImpl extends ServiceImpl<AllocCanteenMapper, All
             treeNode.setName(canteen.getTreeName());
             treeNode.setParentId(canteen.getParentId());
             treeNode.putExtra("treeType", canteen.getTreeType());
-            treeNode.putExtra("halfSelect", canteen.getHalfSelect());
+//            treeNode.putExtra("halfSelect", canteen.getHalfSelect());
         });
     }
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java
index a443b404..94a241e0 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java
@@ -140,7 +140,7 @@ public class MgrAuthApi {
          merchantVO.setTreeName(merchant.getMerchantName());
          merchantVO.setTreeType(DataTreeTypeEnum.MERCHANT.getKey());
          merchantVO.setBizType(0);
-         merchantVO.setHalfSelect(LeConstants.COMMON_YES);
+//         merchantVO.setHalfSelect(LeConstants.COMMON_YES);
          list.add(merchantVO);
          List<AllocAreaVO> allocAreaList = this.allocCanteenApi.listAreaByUserRole(mgrUserAuthPO);
          allocAreaList.forEach((area) -> {
@@ -150,7 +150,7 @@ public class MgrAuthApi {
             areaVO.setTreeName(area.getAreaName());
             areaVO.setTreeType(DataTreeTypeEnum.AREA.getKey());
             areaVO.setBizType(0);
-            areaVO.setHalfSelect(LeConstants.COMMON_YES);
+//            areaVO.setHalfSelect(LeConstants.COMMON_YES);
             list.add(areaVO);
          });
          List<AllocCanteenVO> canteenList = this.allocCanteenApi.listCanteenByUserRole();
@@ -161,7 +161,7 @@ public class MgrAuthApi {
             canteenVO.setTreeName(canteen.getCanteenName());
             canteenVO.setTreeType(DataTreeTypeEnum.CANTEEN.getKey());
             canteenVO.setBizType(canteen.getCanteenType());
-            canteenVO.setHalfSelect(LeConstants.COMMON_YES);
+//            canteenVO.setHalfSelect(LeConstants.COMMON_YES);
             list.add(canteenVO);
          });
          List<AllocStallVO> stallList = this.allocCanteenApi.listStallByUserRole();
@@ -172,7 +172,7 @@ public class MgrAuthApi {
             stallVO.setTreeName(stall.getStallName());
             stallVO.setTreeType(DataTreeTypeEnum.STALL.getKey());
             stallVO.setBizType(stall.getStallType());
-            stallVO.setHalfSelect(LeConstants.COMMON_YES);
+//            stallVO.setHalfSelect(LeConstants.COMMON_YES);
             list.add(stallVO);
          });
          return list;
@@ -238,9 +238,9 @@ public class MgrAuthApi {
                         });
                      }
 
-                     if (ObjectUtil.equal(canteen.getHalfSelect(), LeConstants.COMMON_YES)) {
-                        canteenStallList.add(canteen.getId() + "_-1");
-                     }
+//                     if (ObjectUtil.equal(canteen.getHalfSelect(), LeConstants.COMMON_YES)) {
+//                        canteenStallList.add(canteen.getId() + "_-1");
+//                     }
 
                   });
                } else {