From f7fdf63c13241dfa7d66a3315fd54429670e24bf Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 21 六月 2022 08:37:49 +0800
Subject: [PATCH] 基础资料问题优化
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 209 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 196 insertions(+), 13 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 8875edf..a66ec5a 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -75,7 +75,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -134,7 +136,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -160,12 +164,16 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
if (operType == "Update")
@@ -181,19 +189,25 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -223,19 +237,25 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -294,7 +314,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -330,7 +352,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.data = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -386,12 +410,16 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
if (OperType == "Update")
@@ -411,19 +439,25 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -442,7 +476,7 @@
dynamicParams.Add("@userid", userid);
var data = DapperHelper.selectdata(sql, dynamicParams);
- sql = @"update TUserRoleRelation set is_delete='1' where user_code=@usercode";
+ sql = @"delete TUserRoleRelation where user_code=@usercode";
list.Add(new { str = sql, parm = new { usercode = data.Rows[0]["USERCODE"].ToString() } });
sql = @"update TUser set is_delete='1' where id=@userid";
@@ -451,18 +485,24 @@
if (aa)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鍒犻櫎鐢ㄦ埛澶辫触!";
+ mes.data = null;
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -505,7 +545,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -552,18 +594,24 @@
if (aa)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -583,7 +631,9 @@
if (rowsnum == 0)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "Excel琛ㄦ牸涓虹┖,鏃犳暟鎹紒";
+ mes.data = null;
}
else
{
@@ -614,19 +664,25 @@
if (aa)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "瀵煎叆鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "瀵煎叆澶辫触!";
+ mes.data = null;
}
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -644,7 +700,7 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select roletype_code,roletype_name
from TRoleType
- where A.is_delete<>'1' ";
+ where is_delete<>'1' ";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -654,7 +710,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -672,7 +730,7 @@
//寰幆鍐欏叆瑙掕壊绫诲瀷琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TRoleType(roletypecode,roletypename) values(@roletypecode,@roletypename)";
+ sql = @"insert into TRoleType(roletype_code,roletype_name) values(@roletypecode,@roletypename)";
list.Add(new
{
str = sql,
@@ -687,18 +745,24 @@
if (aa)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -720,18 +784,24 @@
if (aa)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -771,7 +841,7 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.lm_user,A.lm_date,A.is_user,A.is_right
+ var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,A.lm_user,A.lm_date,A.is_user,A.is_right
from TRole A
left join TRoleType B on A.roletype_code=B.roletype_code
where A.is_delete<>'1' " + search;
@@ -784,7 +854,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -810,17 +882,21 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
if (OperType == "Update")
{
- var sql = @"update TRole set role_name=@UserName,Usercode=@Usercode,CreateDate=@CreateDate,RoleTypeCode=@RoleTypeCode,description=@description where id=@RoleId";
+ var sql = @"update TRole set role_name=@RoleName,lm_user=@Usercode,lm_date=@CreateDate,roletype_code=@RoleTypeCode,description=@description where id=@RoleId";
dynamicParams.Add("@RoleId", RoleId);
dynamicParams.Add("@RoleName", RoleName);
dynamicParams.Add("@Usercode", Usercode);
@@ -831,19 +907,25 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -860,27 +942,33 @@
sql = @"update TRole set is_user='N',is_right='N',is_delete='1' where role_code=@RoleCode";
list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
//鏇存柊瑙掕壊鍏宠仈鐢ㄦ埛琛ㄣ�佽鑹插叧鑱旂敤鎴锋爣璇嗗強鍒犻櫎鐘舵��
- sql = @"update TUserRoleRelation set is_delete='1' where role_code=@RoleCode";
+ sql = @"delete TUserRoleRelation where role_code=@RoleCode";
list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
//鍒犻櫎(鏇存柊鐘舵��)瑙掕壊鍔熻兘琛�
- sql = @"update TRoleRightRelation set is_delete='1' where user_code=@RoleCode";
+ sql = @"update TRoleRightRelation set is_delete='1' where role_code=@RoleCode";
list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鍒犻櫎鐢ㄦ埛澶辫触!";
+ mes.data = null;
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -895,12 +983,12 @@
{
if (usercode != "" && usercode != null)
{
- search += "and A.usercode like '%'+@RoleCode+'%' ";
+ search += "and A.usercode like '%'+@usercode+'%' ";
dynamicParams.Add("@usercode", usercode);
}
if (username != "" && username != null)
{
- search += "and A.username like '%'+@RoleName+'%' ";
+ search += "and A.username like '%'+@username+'%' ";
dynamicParams.Add("@username", username);
}
if (orgcode != "" && orgcode != null)
@@ -921,7 +1009,7 @@
}
if (search == "")
{
- search = "and 1=1 ";
+ search = " and 1=1 ";
}
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
@@ -931,7 +1019,8 @@
left join TOrganization B on A.stu_torgcode=B.org_code
left join (
select distinct user_code from TUserRoleRelation where role_code=@rolecode
- ) C on A.usercode=C.user_code" + search;
+ ) C on A.usercode=C.user_code where A.is_delete<>'1' " + search;
+ dynamicParams.Add("@rolecode", rolecode);
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -941,7 +1030,69 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ1]
+ public static ToMessage RoleAssociationUserTwo(string rolecode)
+ {
+ var dynamicParams = new DynamicParameters();
+ string sql = "";
+ try
+ {
+ List<TreeDG> list = new List<TreeDG>();
+ sql = @"select id,parent_id,org_code,org_name,description
+ FROM TOrganization ";
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ for (int i = 0; i < dt.Rows.Count; i++) //杩欓噷鏄惊鐜墍鏈�
+ {
+ if (string.IsNullOrEmpty(dt.Rows[i]["PARENT_ID"].ToString()) || dt.Rows[i]["PARENT_ID"].ToString() == "0") //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐�
+ {
+ TreeDG tbj = new TreeDG();
+ tbj.id = dt.Rows[i]["ID"].ToString();
+ tbj.code = dt.Rows[i]["ORG_CODE"].ToString();
+ tbj.name = dt.Rows[i]["ORG_NAME"].ToString();
+ list.Add(tbj);
+ }
+ }
+ digui(dt, list);
+ mes.code = "200";
+ mes.Message = "鍔犺浇瀹屾垚";
+ mes.data = list;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.data = e.Message;
+ mes.data = null;
+ }
+ return mes;
+
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<TreeObejct> list = new List<TreeObejct>();
+ try
+ {
+ //鑾峰彇瑙掕壊绫诲瀷闆嗗悎(鍖呭惈缁戝畾鏍囪瘑)
+ dynamicParams.Add("@role_code", rolecode);
+ var data = DapperHelper.selectProcedure("h_p_T_RoleAssociationUserDisplay", dynamicParams);
+
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -972,8 +1123,8 @@
//寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TUserRoleRelation(usercode,role_code) values(@usercode,@role_code)";
- list.Add(new { str = sql, parm = new { usercode = json[i], role_code = rolecode } });
+ sql = @"insert into TUserRoleRelation(user_code,role_code) values(@usercode,@role_code)";
+ list.Add(new { str = sql, parm = new { usercode = json[i].code, role_code = rolecode } });
}
//鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
sql = @"update TRole set is_user='Y' where role_code=@rolecode";
@@ -983,18 +1134,24 @@
if (aa)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -1027,7 +1184,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -1080,18 +1239,24 @@
if (aa)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -1142,7 +1307,9 @@
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -1170,12 +1337,16 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
if (OperType == "Update")
@@ -1193,19 +1364,25 @@
if (cont > 0)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.data = null;
}
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
@@ -1225,18 +1402,24 @@
if (aa)
{
mes.code = "200";
+ mes.count = 0;
mes.Message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
+ mes.data = null;
}
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "鍒犻櫎鐢ㄦ埛澶辫触!";
+ mes.data = null;
}
}
catch (Exception e)
{
mes.code = "300";
+ mes.count = 0;
mes.Message = e.Message;
+ mes.data = null;
}
return mes;
}
--
Gitblit v1.9.3