From 3c698cf6ad66b730b844e6f51775cbfaefffda00 Mon Sep 17 00:00:00 2001
From: jeesite <jeesite@163.com>
Date: Tue, 11 Jan 2022 12:39:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E7=AE=A1=E7=90=86=E9=BB=98=E8=AE=A4=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E4=B8=8D=E8=83=BD=E5=8F=96=E6=B6=88=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/CorpAdminController.java    |  5 ++++-
 .../views/modules/sys/user/corpAdminForm.html        | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
index 04e3caa0..93c096f0 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
@@ -93,7 +93,10 @@ public class CorpAdminController extends BaseController {
 		// 获取当前用户所拥有的角色
 		Role role = new Role();
 		role.setUserCode(user.getUserCode());
-		model.addAttribute("roleList", roleService.findListByUserCode(role));
+		List<Role> roleList = roleService.findListByUserCode(role);
+		roleList.add(new Role(Role.CORP_ADMIN_ROLE_CODE));
+		model.addAttribute("roleList", roleList);
+		model.addAttribute("corpAdminRoleCode", Role.CORP_ADMIN_ROLE_CODE);
 		// 操作类型：addCorp: 添加租户； addAdmin: 添加管理员； edit: 编辑
 		model.addAttribute("op", op);
 		model.addAttribute("user", user);
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
index 10557bb0..fc03a02a 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
@@ -190,6 +190,18 @@ var roleGrid = $("#roleGrid").dataGrid({
 	autoGridWidth: function(){
 		return $('#inputForm .box-body').width()-20;
 	},
+	onSelectRow: function(id, isSelect, event){
+		if (!isSelect && id == '${corpAdminRoleCode}') {
+			js.showMessage('${text("该角色为管理员默认，不能取消。")}');
+		}
+	},
+	onSelectAll: function(ids, isSelect){
+		for (var i=0; i<ids.length; i++){
+			if (!isSelect && ids[i] == '${corpAdminRoleCode}') {
+				js.showMessage('${text("该角色为管理员默认，不能取消。")}');
+			}
+		}
+	},
 	ajaxSuccess: function(){
 		<% for (role in roleList!){ %>
  		roleGrid.dataGrid('setSelectRow', '${role.roleCode}');