From 3a4990e3d47a61d281d751ac85fe2997004e2fb2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 27 一月 2024 00:54:49 +0800
Subject: [PATCH] fix 修复 岗位下拉框接口权限标识符错误
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java
index 28e56a2..8071006 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java
@@ -1,6 +1,9 @@
package org.dromara.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.UserConstants;
import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log;
@@ -11,8 +14,6 @@
import org.dromara.system.domain.bo.SysPostBo;
import org.dromara.system.domain.vo.SysPostVo;
import org.dromara.system.service.ISysPostService;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -88,6 +89,9 @@
return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
} else if (!postService.checkPostCodeUnique(post)) {
return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
+ } else if (UserConstants.POST_DISABLE.equals(post.getStatus())
+ && postService.countUserPostById(post.getPostId()) > 0) {
+ return R.fail("璇ュ矖浣嶄笅瀛樺湪宸插垎閰嶇敤鎴凤紝涓嶈兘绂佺敤!");
}
return toAjax(postService.updatePost(post));
}
@@ -106,10 +110,13 @@
/**
* 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
+ *
+ * @param postIds 宀椾綅ID涓�
*/
+ @SaCheckPermission("system:post:query")
@GetMapping("/optionselect")
- public R<List<SysPostVo>> optionselect() {
- List<SysPostVo> posts = postService.selectPostAll();
- return R.ok(posts);
+ public R<List<SysPostVo>> optionselect(@RequestParam(required = false) Long[] postIds) {
+ return R.ok(postService.selectPostByIds(List.of(postIds)));
}
+
}
--
Gitblit v1.9.3