bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "移除 PERMISSION_STALL， 用PERMISSION_CANTEEN替代" 

This reverts commit 324f56d922.
This commit is contained in:
sxu 2025-03-11 16:55:47 +08:00
parent 31e97b5d20
commit bb5f185cd7
3 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocMealLineMapper.java
View File

@ -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);
//

56
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocStallMapper.java
View File

@ -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);

7
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/enums/DataPermissionTypeEnum.java
View File

@ -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};
}
}