From db3253cb595be3682157a632a77078cc513603c3 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 24 Mar 2021 16:06:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/controller/RoleMngController.java | 82 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/RoleMngController.java b/src/main/java/com/nanometer/smartlab/controller/RoleMngController.java
index 46cc2e2..1bb893a 100644
--- a/src/main/java/com/nanometer/smartlab/controller/RoleMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/RoleMngController.java
@@ -61,6 +61,34 @@
RequestContext.getCurrentInstance().execute("PF('dialog').show()");
}
+ public void btnPermissionClick() {
+ if (this.selectedList == null
+ || this.selectedList.size() == 0) {
+ FacesUtils.warn("请选择数据。");
+ return;
+ }
+ if (this.selectedList.size() > 1) {
+ FacesUtils.warn("只能选择一个数据进行修改。");
+ return;
+ }
+ this.baseRole = this.baseRoleService.getBaseRole(this.selectedList.get(0).getId());
+ RequestContext.getCurrentInstance().execute("PF('btnDialog').show()");
+ }
+
+ public void userPermissionClick() {
+ if (this.selectedList == null
+ || this.selectedList.size() == 0) {
+ FacesUtils.warn("请选择数据。");
+ return;
+ }
+ if (this.selectedList.size() > 1) {
+ FacesUtils.warn("只能选择一个数据进行修改。");
+ return;
+ }
+ this.baseRole = this.baseRoleService.getBaseRole(this.selectedList.get(0).getId());
+ RequestContext.getCurrentInstance().execute("PF('userDialog').show()");
+ }
+
public void onSaveBtnClick() {
try {
// 新建
@@ -79,7 +107,8 @@
FacesUtils.warn("请选择角色权限。");
return;
}
-
+ baseRole.setUserPermission("自己");
+ baseRole.setBtnPermission("新增,修改,删除,导入");
this.baseRoleService.insertBaseRole(this.baseRole);
FacesUtils.info("新建成功。");
@@ -111,6 +140,57 @@
FacesUtils.warn("操作失败。");
}
}
+ /**
+ * 人员管理按钮权限修改
+ */
+ public void onSaveBtnPermission() {
+ try {
+ if (this.baseRole == null) {
+ FacesUtils.warn("修改对象为空。");
+ return;
+ }
+
+
+ if (this.baseRole.getBtnPermissions() == null || this.baseRole.getBtnPermissions().size() == 0) {
+ FacesUtils.warn("请选择功能。");
+ return;
+ }
+
+ this.baseRoleService.updateUserMngPageBtn(this.baseRole);
+
+ FacesUtils.info("修改成功。");
+ RequestContext.getCurrentInstance().execute("PF('btnDialog').hide()");
+ } catch (Exception e) {
+ logger.error("操作失败。", e);
+ FacesUtils.warn("操作失败。");
+ }
+ }
+
+ /**
+ * 人员管理人员可见权限修改
+ */
+ public void onSaveUserPermission() {
+ try {
+ if (this.baseRole == null) {
+ FacesUtils.warn("修改对象为空。");
+ return;
+ }
+
+
+ if (this.baseRole.getUserPermission() == null) {
+ FacesUtils.warn("请选择可见范围。");
+ return;
+ }
+
+ this.baseRoleService.updateUserMngPageBtn(this.baseRole);
+
+ FacesUtils.info("修改成功。");
+ RequestContext.getCurrentInstance().execute("PF('userDialog').hide()");
+ } catch (Exception e) {
+ logger.error("操作失败。", e);
+ FacesUtils.warn("操作失败。");
+ }
+ }
public void onDeleteBtnClick() {
try {
--
Gitblit v1.9.2