From ec95efccbcd5c209895428b9bd290b3b6bfcfa78 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 4 Apr 2025 16:45:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E7=94=A8=E5=B2=97=E4=BD=8D=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=9D=83=E9=99=90=E6=9D=83=E9=99=90=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=99=E4=BA=88=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/web/user/EmpUserController.java       | 11 +++++++----
 .../resources/views/modules/sys/user/empUserForm.html |  6 ++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
index 18841b4d..d064ecbe 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
@@ -165,8 +165,9 @@ public class EmpUserController extends BaseController {
 		model.addAttribute("op", op);
 		model.addAttribute("empUser", empUser);
 		
-		// 获取控制权限类型
+		// 获取控制权限类型、岗位角色权限参数
 		model.addAttribute("ctrlPermi", Global.getConfig("user.adminCtrlPermi", "2"));
+		model.addAttribute("postRolePermi", Global.getConfigToBoolean("user.postRolePermi", "false"));
 		return "modules/sys/user/empUserForm";
 	}
 
@@ -191,9 +192,11 @@ public class EmpUserController extends BaseController {
 		if (StringUtils.inString(op, Global.OP_ADD, Global.OP_EDIT) && subject.isPermitted("sys:empUser:edit")){
 			empUserService.save(empUser);
 		}
-		/*if (StringUtils.inString(op, Global.OP_AUTH) && Global.getConfigToBoolean("user.postRolePermi", "false")) {
-			return renderResult(Global.FALSE, text("启用岗位角色后，将不允许单独对用户修改角色", empUser.getUserName()));
-		} else */if (StringUtils.inString(op, Global.OP_ADD, Global.OP_AUTH) && subject.isPermitted("sys:empUser:authRole")){
+		if (Global.getConfigToBoolean("user.postRolePermi", "false")) {
+			if (StringUtils.inString(op, Global.OP_AUTH)) {
+				return renderResult(Global.FALSE, text("启用岗位角色权限后，请在用户关联岗位中关联角色", empUser.getUserName()));
+			}
+		}else if (StringUtils.inString(op, Global.OP_ADD, Global.OP_AUTH) && subject.isPermitted("sys:empUser:authRole")){
 			userService.saveAuth(empUser);
 		}
 		return renderResult(Global.TRUE, text("保存用户''{0}''成功", empUser.getUserName()));
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
index eeed755f..1aa64844 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
@@ -202,6 +202,12 @@
 				<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) { %>
 				<div class="form-unit">${text('分配角色')}</div>
 				<div class="form-unit-wrap table-form">
+					<% if(postRolePermi!) { %>
+					<div class="alert alert-dismissible callout callout-info mb20" id="alert">
+						<button type="button" class="close" data-dismiss="alert" id="alertClose">×</button>
+						<p><i class="icon fa fa-info"></i> 启用岗位角色权限权限后，角色不会保存，请在用户关联岗位中关联角色。</p>
+					</div>
+					<% } %>
 					<table id="roleGrid"></table>
 					<#form:hidden name="userRoleString"/>
 				</div>