From ae0d4dd6e574367b5b89a06be90b00f2eb1e40ba Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 07 八月 2023 18:01:22 +0800
Subject: [PATCH] update 优化 岗位如果绑定了用户则不允许禁用
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java | 2 +-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java | 8 +++++++-
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java | 10 ++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java
index c78adc2..6f3b0b9 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java
@@ -53,6 +53,16 @@
String DEPT_DISABLE = "1";
/**
+ * 宀椾綅姝ｅ父鐘舵��
+ */
+ String POST_NORMAL = "0";
+
+ /**
+ * 宀椾綅鍋滅敤鐘舵��
+ */
+ String POST_DISABLE = "1";
+
+ /**
* 瀛楀吀姝ｅ父鐘舵��
*/
String DICT_NORMAL = "0";
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..fe62fdb 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 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;
@@ -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));
}
@@ -109,7 +113,9 @@
*/
@GetMapping("/optionselect")
public R<List<SysPostVo>> optionselect() {
- List<SysPostVo> posts = postService.selectPostAll();
+ SysPostBo postBo = new SysPostBo();
+ postBo.setStatus(UserConstants.POST_NORMAL);
+ List<SysPostVo> posts = postService.selectPostList(postBo);
return R.ok(posts);
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
index d9529e7..b69a06c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
@@ -156,7 +156,7 @@
for (Long postId : postIds) {
SysPost post = baseMapper.selectById(postId);
if (countUserPostById(postId) > 0) {
- throw new ServiceException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", post.getPostName()));
+ throw new ServiceException(String.format("%1$s宸插垎閰嶏紝涓嶈兘鍒犻櫎!", post.getPostName()));
}
}
return baseMapper.deleteBatchIds(Arrays.asList(postIds));
--
Gitblit v1.9.3