From 714624c1bcf99d26878134e3372333bab4b2b5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 2 Aug 2020 18:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/common/common.js    | 16 ++++++++++++++++
 erp_web/pages/manage/user.html | 17 +++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/erp_web/js/common/common.js b/erp_web/js/common/common.js
index 5d010336..d27e9253 100644
--- a/erp_web/js/common/common.js
+++ b/erp_web/js/common/common.js
@@ -422,6 +422,22 @@
 		return res;
 	}
 
+	/**
+	 * 检查当前用户是否是管理员-用户模块
+	 */
+	function checkPowerForUser() {
+		var res = false;
+		var loginName = sessionStorage.getItem("loginName");
+		if(loginName == "admin") {
+			$.messager.alert('提示：本系统为多租户SAAS系统','请先到<a target="_parent" href="/register.html">注册页面</a>' +
+				'进行租户注册，<br/>然后使用租户账号登录系统，<br/>最后通过租户去创建用户！','warning');
+			res = true;
+		} else {
+			res = false;
+		}
+		return res;
+	}
+
 	/**
 	 * 判断一个值是否数字
 	 * @param value
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html
index 09f80460..2078237e 100644
--- a/erp_web/pages/manage/user.html
+++ b/erp_web/pages/manage/user.html
@@ -186,7 +186,20 @@
                         return str;
                     }
                 },
-                {title: '登录名称', field: 'loginName', width: 80},
+                {title: '登录名称', field: 'loginName', width: 80, align: "center"},
+                {
+                    title: '用户类型', field: 'userType', width: 80, formatter: function (value, rec, index) {
+                        var str = '';
+                        if (rec.id == rec.tenantId) {
+                            str = "租户";
+                        } else if(rec.tenantId == null){
+                            str = "超管";
+                        } else {
+                            str = "普通";
+                        }
+                        return str;
+                    }
+                },
                 {title: '用户姓名', field: 'username', width: 80, align: "center"},
                 {title: '职位', field: 'position', width: 115, align: "center"},
                 {title: '部门', field: 'orgAbr', width: 115, align: "center"},
@@ -354,7 +367,7 @@
     var userID = 0;
 
     function addUser() {
-        if(checkPower()){
+        if(checkPowerForUser()){
             return;
         }
         $('#userDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加用户');