From 8482203c3b572e15249b3439d295219188543140 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期三, 24 四月 2024 22:29:46 +0800
Subject: [PATCH] !520 add 新增岗位编码与部门编码 并将岗位放到部门下 * add 新增岗位编码以及查询 * add 新增部门编码以及查询
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 330b3fb..782bcfc 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,7 @@
package org.dromara.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.UserConstants;
@@ -17,6 +18,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -112,11 +114,20 @@
* 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
*
* @param postIds 宀椾綅ID涓�
+ * @param deptId 閮ㄩ棬id
*/
@SaCheckPermission("system:post:query")
@GetMapping("/optionselect")
- public R<List<SysPostVo>> optionselect(@RequestParam(required = false) Long[] postIds) {
- return R.ok(postService.selectPostByIds(postIds == null ? null : List.of(postIds)));
+ public R<List<SysPostVo>> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) {
+ List<SysPostVo> list = new ArrayList<>();
+ if (ObjectUtil.isNotNull(deptId)) {
+ SysPostBo post = new SysPostBo();
+ post.setDeptId(deptId);
+ list = postService.selectPostList(post);
+ } else if (postIds != null) {
+ list = postService.selectPostByIds(List.of(postIds));
+ }
+ return R.ok(list);
}
}
--
Gitblit v1.9.3