From bb5f185cd73ab00dc166f0347891a965bde49202 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 11 Mar 2025 16:55:47 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E7=A7=BB=E9=99=A4=20PERMISSION=5FSTA?=
 =?UTF-8?q?LL=EF=BC=8C=20=E7=94=A8PERMISSION=5FCANTEEN=E6=9B=BF=E4=BB=A3"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 324f56d92232ed67abf85727f40333cbebf2db0f.
---
 .../canteen/mapper/AllocMealLineMapper.java   |  8 +--
 .../canteen/mapper/AllocStallMapper.java      | 56 +++++++------------
 .../auth/enums/DataPermissionTypeEnum.java    |  7 +--
 3 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocMealLineMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocMealLineMapper.java
index 620f73e0..ca161338 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocMealLineMapper.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocMealLineMapper.java
@@ -18,13 +18,9 @@ public interface AllocMealLineMapper extends BaseMapper<AllocMealLine> {
    @Select({"SELECT MAX(meal_line_num) FROM alloc_meal_line WHERE if_del = 2 AND stall_id = #{stallId}"})
    String getLatestMealLineNum(Long stallId);
 
-//   @LeNiuDataPermission(
-//      alias = "t1",
-//      permissionType = DataPermissionTypeEnum.PERMISSION_STALL
-//   )
    @LeNiuDataPermission(
-           alias = "t5",
-           permissionType = DataPermissionTypeEnum.PERMISSION_AREA
+      alias = "t1",
+      permissionType = DataPermissionTypeEnum.PERMISSION_STALL
    )
    Page<AllocMealLineVO> pageMealLine(@Param("page") Page<AllocMealLineVO> page, @Param("param") AllocCanteenStallPageParam param);
 //
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocStallMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocStallMapper.java
index 824693b9..14dc1c52 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocStallMapper.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocStallMapper.java
@@ -24,17 +24,13 @@ public interface AllocStallMapper extends BaseMapper<AllocStall> {
     @Select({"SELECT t2.business_state FROM alloc_stall t1 INNER JOIN alloc_canteen t2 ON t1.canteen_id = t2.canteen_id  WHERE stall_id = #{stallId}"})
     Integer getCanteenStateByStallId(Long stallId);
 
-//    @LeNiuDataPermission.List({@LeNiuDataPermission(
-//            alias = "t1",
-//            permissionType = DataPermissionTypeEnum.PERMISSION_STALL
-//    ), @LeNiuDataPermission(
-//            alias = "t6",
-//            permissionType = DataPermissionTypeEnum.PERMISSION_AREA
-//    )})
-    @LeNiuDataPermission(
+    @LeNiuDataPermission.List({@LeNiuDataPermission(
+            alias = "t1",
+            permissionType = DataPermissionTypeEnum.PERMISSION_STALL
+    ), @LeNiuDataPermission(
             alias = "t6",
             permissionType = DataPermissionTypeEnum.PERMISSION_AREA
-    )
+    )})
     Page<AllocStallVO> pageStall(@Param("page") Page<AllocStallVO> page, @Param("param") AllocCanteenStallPageParam param);
 
     @Select({"SELECT stall_id, canteen_id FROM alloc_stall WHERE if_del = 2 AND stall_num IS NULL ORDER BY id ASC"})
@@ -64,45 +60,33 @@ public interface AllocStallMapper extends BaseMapper<AllocStall> {
     List<AllocStallVO> listAuthStallByUserRole();
 
 
-//    @LeNiuDataPermission.List({@LeNiuDataPermission(
-//            alias = "t1",
-//            permissionType = DataPermissionTypeEnum.PERMISSION_STALL
-//    ), @LeNiuDataPermission(
-//            alias = "t3",
-//            permissionType = DataPermissionTypeEnum.PERMISSION_AREA
-//    )})
-    @LeNiuDataPermission(
+    @LeNiuDataPermission.List({@LeNiuDataPermission(
+            alias = "t1",
+            permissionType = DataPermissionTypeEnum.PERMISSION_STALL
+    ), @LeNiuDataPermission(
             alias = "t3",
             permissionType = DataPermissionTypeEnum.PERMISSION_AREA
-    )
+    )})
     Page<AllocRecipeStallVO> pageRecipeMealLineInfo(@Param("page") Page<AllocRecipeStallVO> page, @Param("param") AllocRecipeStallDTO recipeStallDTO);
 
 
-//    @LeNiuDataPermission.List({@LeNiuDataPermission(
-//            alias = "t1",
-//            permissionType = DataPermissionTypeEnum.PERMISSION_STALL
-//    ), @LeNiuDataPermission(
-//            alias = "t3",
-//            permissionType = DataPermissionTypeEnum.PERMISSION_AREA
-//    )})
-    @LeNiuDataPermission(
+    @LeNiuDataPermission.List({@LeNiuDataPermission(
+            alias = "t1",
+            permissionType = DataPermissionTypeEnum.PERMISSION_STALL
+    ), @LeNiuDataPermission(
             alias = "t3",
             permissionType = DataPermissionTypeEnum.PERMISSION_AREA
-    )
+    )})
     Page<AllocRecipeStallVO> pageRecipeStallInfo(@Param("page") Page<AllocRecipeStallVO> page, @Param("param") AllocRecipeStallDTO recipeStallDTO);
 
 
-//    @LeNiuDataPermission.List({@LeNiuDataPermission(
-//            alias = "t1",
-//            permissionType = DataPermissionTypeEnum.PERMISSION_STALL
-//    ), @LeNiuDataPermission(
-//            alias = "t1",
-//            permissionType = DataPermissionTypeEnum.PERMISSION_AREA
-//    )})
-    @LeNiuDataPermission(
+    @LeNiuDataPermission.List({@LeNiuDataPermission(
+            alias = "t1",
+            permissionType = DataPermissionTypeEnum.PERMISSION_STALL
+    ), @LeNiuDataPermission(
             alias = "t1",
             permissionType = DataPermissionTypeEnum.PERMISSION_AREA
-    )
+    )})
     List<AllocStallAuthVO> listAuthStall(@Param("canteenIdList") List<Long> canteenIdList);
 
     List<CanteenStallVO> listStallByCanteenId(@Param("canteenId") Long canteenId);
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/enums/DataPermissionTypeEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/enums/DataPermissionTypeEnum.java
index d952734f..2801ba37 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/enums/DataPermissionTypeEnum.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/enums/DataPermissionTypeEnum.java
@@ -3,8 +3,8 @@ package com.bonus.canteen.core.auth.enums;
 public enum DataPermissionTypeEnum {
    PERMISSION_ORG(1),
    PERMISSION_CANTEEN(2),
-//   PERMISSION_STALL(3),
-//   PERMISSION_CANTEEN_STALL(4),
+   PERMISSION_STALL(3),
+   PERMISSION_CANTEEN_STALL(4),
    PERMISSION_WAREHOUSE(5),
    PERMISSION_SUPERMARKET(6),
    PERMISSION_AREA(7);
@@ -21,7 +21,6 @@ public enum DataPermissionTypeEnum {
 
    // $FF: synthetic method
    private static DataPermissionTypeEnum[] $values() {
-      return new DataPermissionTypeEnum[]{PERMISSION_ORG, PERMISSION_CANTEEN, PERMISSION_WAREHOUSE, PERMISSION_SUPERMARKET, PERMISSION_AREA};
-      //return new DataPermissionTypeEnum[]{PERMISSION_ORG, PERMISSION_CANTEEN, PERMISSION_STALL, PERMISSION_CANTEEN_STALL, PERMISSION_WAREHOUSE, PERMISSION_SUPERMARKET, PERMISSION_AREA};
+      return new DataPermissionTypeEnum[]{PERMISSION_ORG, PERMISSION_CANTEEN, PERMISSION_STALL, PERMISSION_CANTEEN_STALL, PERMISSION_WAREHOUSE, PERMISSION_SUPERMARKET, PERMISSION_AREA};
    }
 }