From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java
index 9c75106..d76847d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffSysController.java
@@ -9,11 +9,12 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.domain.dto.MgtSysStaffImportDto;
import com.ruoyi.system.domain.dto.StaffUseSuggestDto;
-import com.ruoyi.system.domain.pojo.staff.SysStaff;
+import com.ruoyi.system.api.domain.poji.sys.SysStaff;
import com.ruoyi.system.domain.vo.StaffSuggestPageVo;
import com.ruoyi.system.domain.vo.StaffUserGetVo;
import com.ruoyi.system.service.config.StaffSuggestService;
import com.ruoyi.system.service.staff.SysStaffService;
+import com.ruoyi.system.service.sys.ISysPermissionService;
import com.ruoyi.system.service.sys.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,6 +23,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Set;
import static com.ruoyi.common.core.web.domain.AjaxResult.success;
@@ -46,6 +48,9 @@
@Resource
private StaffSuggestService staffSuggestService;
+ @Resource
+ private ISysPermissionService permissionService;
+
@RequestMapping(value = "/getStaffShopInfo", method = RequestMethod.POST)
@ApiOperation(value = "获取员工端商户信息")
public R<StaffUserGetVo> getStaffShopInfo() {
@@ -62,6 +67,15 @@
return R.ok(staffUserGetVo);
}
+ @RequestMapping(value = "/getStaffPermissions", method = RequestMethod.POST)
+ @ApiOperation(value = "获取员工端权限")
+ public R<Set<String>> getStaffPermissions() {
+ Long userId = SecurityUtils.getUserId();
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ Set<String> permissions = permissionService.getStaffClientMenuPermission(sysUser);
+ return R.ok(permissions);
+ }
+
@RequestMapping(value = "/staffSuggest", method = RequestMethod.POST)
@ApiOperation(value = "员工发起建议")
public R userSuggest(@RequestBody StaffUseSuggestDto staffUseSuggestDto) {
--
Gitblit v1.7.1