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')) { %>
${text('分配角色')}