From d3a77a7960ceda2fc35d100647999b04fcbb7cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 10 Aug 2020 23:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/common/common.js    |  2 +-
 erp_web/pages/manage/user.html | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/erp_web/js/common/common.js b/erp_web/js/common/common.js
index d27e9253..ff31bef0 100644
--- a/erp_web/js/common/common.js
+++ b/erp_web/js/common/common.js
@@ -414,7 +414,7 @@
     	var res = false;
         var loginName = sessionStorage.getItem("loginName");
         if(loginName == "admin") {
-            $.messager.alert('提示','管理员不能增加表单数据！','warning');
+            $.messager.alert('提示','管理员不能增加表单数据，请使用租户账号进行操作！','warning');
             res = true;
         } else {
             res = false;
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html
index 2078237e..0d5c5548 100644
--- a/erp_web/pages/manage/user.html
+++ b/erp_web/pages/manage/user.html
@@ -548,11 +548,17 @@
             $.messager.alert('提示',"请选择一条数据再操作！",'warning');
             return false;
         }
-        if (currentRow.id == currentRow.tenantId) {
-            $.messager.alert('提示',"不能给自己配置角色！",'warning');
+        var loginName = sessionStorage.getItem("loginName");
+        if(loginName == "admin") {
+            $.messager.alert('提示', '管理员不能分配角色,请使用租户账号进行操作！', 'warning');
             return false;
+        } else {
+            if (currentRow.id == currentRow.tenantId) {
+                $.messager.alert('提示',"租户不能给自己分配角色！",'warning');
+                return false;
+            }
+            this.href = "/pages/user/userRole.html?id=" + currentRow.id;
         }
-        this.href = "/pages/user/userRole.html?id=" + currentRow.id;
     });
 
     //分配部门