From f63d8ead25bdb3c32dacca817a059bd30390e9bc Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期三, 15 六月 2022 22:20:07 +0800
Subject: [PATCH] 1.系统账户数据库优化： 修改“账户类型”的数据类型为VARCHAR2(1024)，多个角色时以半角“,”分隔。 加密盐。 密码加密优化；账户登录优化；角色权限管理（作废用户权限）； 2.字典类型管理（定义：用户角色） 3.字典数据管理（初始化用户角色数据） 3.角色权限管理 4.系统账户管理，账户类型对应用户角色（可多选）。
---
web/web/SysDictData.ashx | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/web/web/SysDictData.ashx b/web/web/SysDictData.ashx
index 313c5aa..69fadbf 100644
--- a/web/web/SysDictData.ashx
+++ b/web/web/SysDictData.ashx
@@ -49,6 +49,7 @@
{
string dictLabel = context.GetString("dictLabel");
string dictType = context.GetString("dictType");
+ string source = context.GetString("source");
int recordCount = 0;
int pageSize = context.GetInt("pageSize", 50);
@@ -69,19 +70,26 @@
str1 += "<td>" + bean.DictLabel + "</td>";
str1 += "<td>" + bean.DictType + "</td>";
str1 += "<td>" + bean.DictSort + "</td>";
+ str1 += "<td>" + (bean.ParanSource == 0 ? "绯荤粺鍐呯疆" : "鐢ㄦ埛娣诲姞") + "</td>";
str1 += "<td>" + SysUserName(string.IsNullOrEmpty(bean.CreateBy)? 0: int.Parse(bean.CreateBy) ) + "</td>";
str1 += "<td>" + bean.CreateTime + "</td>";
str1 += "<td>" + (bean.Status == 1 ? "<span class='label label-primary'>姝ｅ父</span>" : "<span class='label label-default'>鍋滅敤</span>") + "</td>";
str1 += "<td class=\"text-center \">";
- str1 = bean.Status != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-status=\"0\" class=\"action-update-status btn btn-default btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a> ", (object) bean.DictId ) : str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-status=\"1\" class=\"action-update-status btn btn-primary btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a> ", (object) bean.DictId );
- str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-modal-edit btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 缂栬緫</a> ", (object) bean.DictId);
- str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-delete btn btn-default btn-xs\"><i class=\"fa fa-trash\"></i> 鍒犻櫎</a> ", (object) bean.DictId);
+ if(bean.ParanSource == 1) {
+ str1 = bean.Status != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-status=\"0\" class=\"action-update-status btn btn-default btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a> ", (object) bean.DictId ) : str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-status=\"1\" class=\"action-update-status btn btn-primary btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a> ", (object) bean.DictId );
+ str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-modal-edit btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 缂栬緫</a> ", (object) bean.DictId);
+ str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-delete btn btn-default btn-xs\"><i class=\"fa fa-trash\"></i> 鍒犻櫎</a> ", (object) bean.DictId);
+ }
+
+ //鏍规嵁鍏ュ彛婧愭樉绀恒�愯鑹叉潈闄愩��
+ if(source.Equals("SysRoleMenu"))
+ str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-permission btn btn-primary btn-xs\"><i class=\"fa fa-cog\"></i> 瑙掕壊鏉冮檺</a> ", (object) bean.DictValue);
str1 += "</td>";
str1 += "</tr>";
}
}
else
- str1 += "<tr><td colspan=\"8\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
+ str1 += "<tr><td colspan=\"9\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
return new JsonPageResult(true, new
{
@@ -118,10 +126,24 @@
string remark = context.GetString("remark", "");
if (string.IsNullOrEmpty(dictValue) ) {
- throw new ArgumentException("瀛楀吀鏁版嵁閿�间笉鑳戒负绌猴紝璇疯緭鍏ワ紒");
+ if (dictType.Equals("USER_ROLE"))
+ {
+ throw new ArgumentException("瑙掕壊缂栫爜涓嶈兘涓虹┖锛岃杈撳叆锛�");
+ }
+ else
+ {
+ throw new ArgumentException("瀛楀吀鏁版嵁閿�间笉鑳戒负绌猴紝璇疯緭鍏ワ紒");
+ }
}
if (string.IsNullOrEmpty(dictLabel) ) {
- throw new ArgumentException("瀛楀吀鏁版嵁鏍囩涓嶈兘涓虹┖锛岃杈撳叆锛�");
+ if (dictType.Equals("USER_ROLE"))
+ {
+ throw new ArgumentException("瑙掕壊鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆锛�");
+ }
+ else
+ {
+ throw new ArgumentException("瀛楀吀鏁版嵁鏍囩涓嶈兘涓虹┖锛岃杈撳叆锛�");
+ }
}
if (string.IsNullOrEmpty(dictType) ) {
throw new ArgumentException("瀛楀吀绫诲瀷缂栫爜涓嶈兘涓虹┖锛岃杈撳叆锛�");
@@ -167,10 +189,24 @@
string remark = context.GetString("remark", "");
if (string.IsNullOrEmpty(dictValue) ) {
- throw new ArgumentException("瀛楀吀鏁版嵁閿�间笉鑳戒负绌猴紝璇疯緭鍏ワ紒");
+ if (dictType.Equals("USER_ROLE"))
+ {
+ throw new ArgumentException("瑙掕壊缂栫爜涓嶈兘涓虹┖锛岃杈撳叆锛�");
+ }
+ else
+ {
+ throw new ArgumentException("瀛楀吀鏁版嵁閿�间笉鑳戒负绌猴紝璇疯緭鍏ワ紒");
+ }
}
if (string.IsNullOrEmpty(dictLabel) ) {
- throw new ArgumentException("瀛楀吀鏁版嵁鏍囩涓嶈兘涓虹┖锛岃杈撳叆锛�");
+ if (dictType.Equals("USER_ROLE"))
+ {
+ throw new ArgumentException("瑙掕壊鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆锛�");
+ }
+ else
+ {
+ throw new ArgumentException("瀛楀吀鏁版嵁鏍囩涓嶈兘涓虹┖锛岃杈撳叆锛�");
+ }
}
if (string.IsNullOrEmpty(dictType) ) {
throw new ArgumentException("瀛楀吀绫诲瀷缂栫爜涓嶈兘涓虹┖锛岃杈撳叆锛�");
--
Gitblit v1.9.1