From a6a84e6f677447342e8c5984fdc0b52241b92ce3 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 30 六月 2022 01:20:34 +0800
Subject: [PATCH] 客户管理分配个性产品优化、返回URL优化
---
web/Dao/UserDao.cs | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 12 deletions(-)
diff --git a/web/Dao/UserDao.cs b/web/Dao/UserDao.cs
index e339782..3e8e6d3 100644
--- a/web/Dao/UserDao.cs
+++ b/web/Dao/UserDao.cs
@@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Configuration;
using System.Data.Common;
+using System.Text;
namespace Dao
{
@@ -23,7 +24,9 @@
if (!((DbDataReader)reader).Read() || !this.ReadInfo(reader, user))
return false;
}
- user.MenuIDList = this.LoadUserMenuList(user.UserID);
+ //浣滃簾鐢ㄦ埛鏉冮檺锛屾敼浣跨敤瑙掕壊鏉冮檺
+ //user.MenuIDList = this.LoadUserMenuList(user.UserID);
+ user.MenuIDList = this.LoadUserRoleMenuList(user.UserID);
return true;
}
@@ -31,12 +34,25 @@
{
List<SysUser> list = new List<SysUser>();
recordCount = 0;
- using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count from Sys_User", OracleHelper.Connection))
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.Append(" FROM ( ");
+ stringBuilder.Append(" SELECT su.*, t.ROLE_NAMES FROM sys_user su ");
+ stringBuilder.Append(" LEFT JOIN ( ");
+ stringBuilder.Append(" select su.user_id, wm_concat( sdd.dict_label) ROLE_NAMES from sys_user su ");
+ stringBuilder.Append(" LEFT JOIN (select DICT_VALUE, DICT_LABEL from sys_dict_data where dict_type='USER_ROLE' ) sdd ");
+ stringBuilder.Append(" on INSTR (user_type, sdd.dict_value) > 0 ");
+ stringBuilder.Append(" GROUP BY su.user_id ");
+ stringBuilder.Append(" ) t on t.user_id = su.user_id ");
+ stringBuilder.Append(" ) ");
+
+ //using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count from Sys_User", OracleHelper.Connection))
+ using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count " + stringBuilder.ToString(), OracleHelper.Connection))
{
while (((DbDataReader)reader).Read())
recordCount = this.ReadCount(reader);
}
- using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * from Sys_User").ToString(), OracleHelper.Connection))
+ //using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * from Sys_User").ToString(), OracleHelper.Connection))
+ using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * " + stringBuilder.ToString() ).ToString(), OracleHelper.Connection))
{
while (((DbDataReader)reader).Read())
{
@@ -48,6 +64,7 @@
return list;
}
+ //edit:yangzh by 20220615 宸蹭綔搴燂紙宸蹭娇鐢ㄧ敤鎴疯鑹插叧鑱旀潈闄�--LoadUserRoleMenuList(int userID) 锛�
public Dictionary<string, SysUserMenu> LoadUserMenuList(int userID)
{
Dictionary<string, SysUserMenu> dictionary = new Dictionary<string, SysUserMenu>();
@@ -64,6 +81,66 @@
return dictionary;
}
+ public Dictionary<string, SysUserMenu> LoadUserRoleMenuList(int userID)
+ {
+ StringBuilder stringBuilder = new StringBuilder();
+
+ Dictionary<string, SysUserMenu> dictionary = new Dictionary<string, SysUserMenu>();
+ string userType = GetUserRoleByUserId(userID);
+ if (!string.IsNullOrEmpty(userType))
+ {
+ List<object> list = DataConverter.stringToList(userType);
+ if (list.Count > 0)
+ {
+ stringBuilder.Append(" select sm.* from sys_menu sm ");
+ stringBuilder.Append(" left join ( ");
+ stringBuilder.Append(" select distinct * from ( ");
+ stringBuilder.Append(" select * from sys_role_menu where role_id = " + list[0] + " ");
+
+ for (int i = 1; i < list.Count; i++)
+ {
+ stringBuilder.Append(" union (select * from sys_role_menu where role_id = " + list[i] + ") ");
+
+ }
+ stringBuilder.Append(" ) bb ");
+ stringBuilder.Append(" ) cc on cc.menu_id = sm.menu_id ");
+ stringBuilder.Append(" where cc.menu_id is not null ");
+ using (OracleDataReader reader = OracleHelper.ExecuteReader(stringBuilder.ToString(), OracleHelper.Connection))
+ {
+ while (reader != null && ((DbDataReader)reader).Read())
+ {
+ /**
+ OracleReaderWrapper oracleReaderWrapper = new OracleReaderWrapper(reader);
+ string menuID = oracleReaderWrapper.GetString("MENU_ID", "");
+ string menuName = oracleReaderWrapper.GetString("MENU_NAME", "");
+ string remark = oracleReaderWrapper.GetString("REMARK", "");
+ string parentID = oracleReaderWrapper.GetString("PARENT_ID", "");
+ int menuLV = oracleReaderWrapper.GetInt("MENU_LV", 0);
+ SysMenu sysMenu = new SysMenu();
+ sysMenu.MenuID = menuID;
+ sysMenu.MenuName = menuName;
+ sysMenu.Remark = remark;
+ sysMenu.ParentID = parentID;
+ sysMenu.MenuLV = menuLV;
+
+ dictionary[menuID] = sysMenu;
+ **/
+
+ OracleReaderWrapper oracleReaderWrapper = new OracleReaderWrapper(reader);
+ string string1 = oracleReaderWrapper.GetString("MENU_ID", "");
+ //string string2 = oracleReaderWrapper.GetString("MENU_DATA", "");
+ string string2 = "";
+
+ dictionary[string1] = new SysUserMenu(string1, string2);
+
+ }
+ }
+ }
+
+ }
+ return dictionary;
+ }
+
public List<SysMenu> LoadSysMenuList()
{
List<SysMenu> list = new List<SysMenu>();
@@ -75,7 +152,7 @@
return list;
}
-//鏂板姞鐧婚檰鏃ュ織
+ //鏂板姞鐧婚檰鏃ュ織
public List<SysMenu> LoadSysMenuIDList(int menuid, int menulv)
{
List<SysMenu> list = new List<SysMenu>();
@@ -132,7 +209,8 @@
e.Password = oracleReaderWrapper.GetString("PASSWORD", "");
e.Salt = oracleReaderWrapper.GetString("SALT", "");
e.UserName = oracleReaderWrapper.GetString("USER_NAME", "");
- e.UserType = oracleReaderWrapper.GetInt("USER_TYPE", 1);
+ e.UserType = oracleReaderWrapper.GetString("USER_TYPE", "");
+ e.RoleNames = oracleReaderWrapper.GetString("ROLE_NAMES", "");
e.ExpireTime = oracleReaderWrapper.GetDateTime("EXPIRE_TIME");
e.CreateTime = oracleReaderWrapper.GetDateTime("CREATE_TIME");
e.Remark = oracleReaderWrapper.GetString("REMARK", "");
@@ -167,8 +245,22 @@
if (reader != null && ((DbDataReader)reader).Read())
this.ReadInfo(reader, e);
}
- e.MenuIDList = this.LoadUserMenuList(userID);
+ //浣滃簾鐢ㄦ埛鏉冮檺锛屾敼浣跨敤瑙掕壊鏉冮檺
+ //e.MenuIDList = this.LoadUserMenuList(userID);
+ e.MenuIDList = this.LoadUserRoleMenuList(userID);
return e;
+ }
+
+ //鏍规嵁璐︽埛ID鑾峰彇鐢ㄦ埛瑙掕壊闆�
+ public string GetUserRoleByUserId(int userID)
+ {
+ SysUser e = new SysUser();
+ using (OracleDataReader reader = OracleHelper.ExecuteReader("SELECT * FROM SYS_USER WHERE USER_ID=:USER_ID", OracleHelper.Connection, new OracleParameter("USER_ID", (object)userID)))
+ {
+ if (reader != null && ((DbDataReader)reader).Read())
+ this.ReadInfo(reader, e);
+ }
+ return e.UserType;
}
public SysUser GetUser(string account)
@@ -266,14 +358,14 @@
foreach (string str in menuIDArray)
{
OracleParameter[] oracleParameterArray2 = new OracleParameter[3]
- {
- new OracleParameter(":USER_ID", (object) userid),
- new OracleParameter(":MENU_ID", (object) str),
- new OracleParameter(":MENU_DATA", (object) "")
- };
+ {
+ new OracleParameter(":USER_ID", (object) userid),
+ new OracleParameter(":MENU_ID", (object) str),
+ new OracleParameter(":MENU_DATA", (object) "")
+ };
list.Add(new KeyValuePair<string, OracleParameter[]>(key2, oracleParameterArray2));
- OracleHelper.ExecuteSqlTran(list, OracleHelper.Connection);
}
+ OracleHelper.ExecuteSqlTran(list, OracleHelper.Connection);
}
private int ReadCount(OracleDataReader reader)
--
Gitblit v1.9.1