From 2264c47cff7ab5ce52d7c158ac0eb941e7b46506 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 31 八月 2022 23:50:53 +0800
Subject: [PATCH] 大岛测试bug修改
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 619afec..e512458 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -44,7 +44,7 @@
}
if (userName != "" && userName != null)
{
- search += "and parent.lm_user like '%'+@userName+'%' ";
+ search += "and U.username like '%'+@userName+'%' ";
dynamicParams.Add("@userName", userName);
}
if (search == "")
@@ -62,10 +62,12 @@
parent.parent_id,
child.org_code as parentorg_code,
child.org_name as parentorg_name,
- parent.lm_user,
+ U.username as lm_user,
parent.lm_date
from TOrganization as parent
- left join TOrganization as child on parent.parent_id=child.id where parent.is_delete<>1 " + search;
+ left join TOrganization as child on parent.parent_id=child.id
+ left join TUser U on parent.lm_user=U.usercode
+ where parent.is_delete<>1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -288,7 +290,7 @@
}
if (UserName != "" && UserName != null)
{
- search += "and u.username like '%'+@UserName+'%' ";
+ search += "and S.username like '%'+@UserName+'%' ";
dynamicParams.Add("@UserName", UserName);
}
if (StuOrg != "" && StuOrg != null)
@@ -313,10 +315,11 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select u.id,u.usercode,u.username,g.group_code,g.group_name,u.stu_torgcode,t.org_name,u.password,u.mobile,u.email,u.wagetype,u.enable,u.lm_user,u.lm_date,u.is_role
+ var sql = @"select u.id,u.usercode,u.username,g.group_code,g.group_name,u.stu_torgcode,t.org_name,u.password,u.mobile,u.email,u.wagetype,u.enable,S.username as lm_user,u.lm_date,u.is_role
from TUser u
left join TOrganization t on u.stu_torgcode=t.org_code
left join TGroup g on u.usergroup_code=g.group_code
+ left join TUser S on u.lm_user=S.usercode
where u.is_delete<>1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -1317,7 +1320,9 @@
public static ToMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
{
var sql = "";
+ var sql2 = "";
List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
list.Clear();
@@ -1329,6 +1334,7 @@
//鏍囪瑙掕壊琛ㄥ叧鑱旂敤鎴锋爣璇�
sql = @"update TRole set is_user='N' where role_code=@rolecode";
list.Add(new { str = sql, parm = new { rolecode = rolecode } });
+
}
else
{
--
Gitblit v1.9.3