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

bug 5414

This commit is contained in:
sxu 2025-03-26 14:47:16 +08:00
parent e3e870b0dc
commit 99529aa002
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccInfoMapper.java
View File

@ -32,19 +32,19 @@ import java.util.List;
public interface AccInfoMapper extends BaseMapper<AccInfo> {
@LeNiuDataPermission(
alias = "t2",
permissionType = DataPermissionTypeEnum.PERMISSION_ORG
permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
)
List<AccInfoPageVO> queryListAccInfo(@Param("infoParam") AccInfoPageDTO content);
@LeNiuDataPermission(
alias = "t2",
permissionType = DataPermissionTypeEnum.PERMISSION_ORG
permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
)
AccInfoPageVO queryPageAccInfoSum(@Param("infoParam") AccInfoPageDTO content);
@LeNiuDataPermission(
alias = "t2",
permissionType = DataPermissionTypeEnum.PERMISSION_ORG
permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
)
List<AccInfoPageVO> queryPageAccInfoForBatch(@Param("infoParam") AccInfoPageDTO accPageParam);
@ -63,8 +63,8 @@ public interface AccInfoMapper extends BaseMapper<AccInfo> {
List<AccInfoVO> listAccInfoVOByCustIdList(@Param("custIdList") List<Long> custIdList);
@LeNiuDataPermission(
alias = "ci",
permissionType = DataPermissionTypeEnum.PERMISSION_ORG
alias = "t2",
permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
)
Page<AccExistFrozenListVO> queryFrozenAccPage(Page<?> page, @Param("infoParam") AccExistFrozenPageDTO pageDTO);
@ -96,7 +96,7 @@ public interface AccInfoMapper extends BaseMapper<AccInfo> {
@LeNiuDataPermission(
alias = "t2",
permissionType = DataPermissionTypeEnum.PERMISSION_ORG
permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
)
Page<AppWorkAccInfoVO> queryPageAccInfoForAppWork(Page<AppWorkAccInfoVO> page, @Param("infoParam") AppWorkAccInfoPageDTO pageDTO);

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccOperationRecordMapper.java
View File

@ -22,7 +22,7 @@ public interface AccOperationRecordMapper extends BaseMapper<AccOperationRecord>
@LeNiuDataPermission(
alias = "t2",
permissionType = DataPermissionTypeEnum.PERMISSION_ORG
permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
)
List<AccOperationRecordPageVO> listForExport(@Param("content") AccOperationRecordPageDTO content);
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccTradeMapper.java
View File

@ -61,7 +61,7 @@ public interface AccTradeMapper extends BaseMapper<AccTrade> {
@LeNiuDataPermission(
alias = "ci",
permissionType = DataPermissionTypeEnum.PERMISSION_ORG
permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
)
List<AccSubCollectVO> listAccSubRechargeCollectPageForCust(@Param("param") AccSubRechargeCollectDTO content);
@ -69,7 +69,7 @@ public interface AccTradeMapper extends BaseMapper<AccTrade> {
@LeNiuDataPermission(
alias = "g",
permissionType = DataPermissionTypeEnum.PERMISSION_ORG
permissionType = DataPermissionTypeEnum.PERMISSION_DEPT
)
List<AccSubCollectVO> listAccSubRechargeCollectPageCustOrg(@Param("param") AccSubRechargeCollectDTO content);

11
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/config/LeNiuDataPermissionHandler.java
View File

@ -91,13 +91,20 @@ public class LeNiuDataPermissionHandler {
if (roleCode.startsWith(RoleCodeV2Enum.ROLE_ADMIN.key()) || GlobalConstants.SUPER_ADMIN_ROLE_KEY.equals(roleCode)) {
return "";
} else {
if (ObjectUtil.equal(DataPermissionTypeEnum.PERMISSION_ORG, permissionType)) {
if (ObjectUtil.equal(DataPermissionTypeEnum.PERMISSION_ORG, permissionType)) {
sb.append(" EXISTS ( ").append(" SELECT null FROM sys_role_dept it1")
.append(" LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id")
.append(" LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id")
.append(" WHERE it2.del_flag = 0 AND it2.role_key = '").append(roleCode)
.append("' AND it3.user_id = ").append(userId).append(" AND ")
.append(alias).append(".org_id = it1.dept_id)");
} else if (ObjectUtil.equal(DataPermissionTypeEnum.PERMISSION_DEPT, permissionType)) {
sb.append(" EXISTS ( ").append(" SELECT null FROM sys_role_dept it1")
.append(" LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id")
.append(" LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id")
.append(" WHERE it2.del_flag = 0 AND it2.role_key = '").append(roleCode)
.append("' AND it3.user_id = ").append(userId).append(" AND ")
.append(alias).append(".org_id = it1.dept_id)");
.append(alias).append(".dept_id = it1.dept_id)");
} else if (ObjectUtil.equal(DataPermissionTypeEnum.PERMISSION_AREA, permissionType)) {
sb.append(" EXISTS ( ").append(" SELECT null FROM sys_role_area it1")
.append(" LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id")

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

@ -7,7 +7,8 @@ public enum DataPermissionTypeEnum {
PERMISSION_CANTEEN_STALL(4),
PERMISSION_WAREHOUSE(5),
PERMISSION_SUPERMARKET(6),
PERMISSION_AREA(7);
PERMISSION_AREA(7),
PERMISSION_DEPT(8),;
private final Integer key;