From 8aad6ba8e082d1fb63bfdd947f7e9da1bc133611 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 24 六月 2022 23:47:19 +0800
Subject: [PATCH] 工序定义接口开发、节拍工价接口开发
---
VueWebApi/Tools/SeachEncode.cs | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index 4424fec..4fb3855 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -81,7 +81,9 @@
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "澶辫触!";
+ mes.data = null;
}
break;
case "骞存湀":
@@ -126,7 +128,9 @@
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "澶辫触!";
+ mes.data = null;
}
break;
case "骞�":
@@ -169,7 +173,9 @@
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "澶辫触!";
+ mes.data = null;
}
break;
@@ -223,7 +229,9 @@
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "澶辫触!";
+ mes.data = null;
}
break;
case "骞存湀":
@@ -268,7 +276,9 @@
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "澶辫触!";
+ mes.data = null;
}
break;
case "骞�":
@@ -311,7 +321,9 @@
else
{
mes.code = "300";
+ mes.count = 0;
mes.Message = "澶辫触!";
+ mes.data = null;
}
break;
default:
@@ -322,13 +334,17 @@
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;
}
@@ -353,7 +369,7 @@
//绗竴灞�
sql = @"select distinct A.parent_id from TRight A
inner join TRoleRightRelation B on A.right_code=B.right_code
- where B.role_code='S001' and A.Type='PC' ";
+ where B.role_code=@rolecode and A.Type='PC' ";
dynamicParams.Add("@rolecode", rolecode);
dynamicParams.Add("@type", type);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
@@ -396,10 +412,11 @@
from TRight A
left join (
select B.right_code from TRight A
- inner join TRoleRightRelation B on A.right_code=B.right_code where A.parent_id=@right_code
+ inner join TRoleRightRelation B on A.right_code=B.right_code where A.parent_id=@right_code and B.role_code=@rolecode
) C on A.right_code=C.right_code
where A.parent_id=@right_code";
dynamicParams.Add("@right_code", data2.Rows[i]["RIGHT_CODE"].ToString());
+ dynamicParams.Add("@rolecode", rolecode);
var data3 = DapperHelper.selectdata(sql, dynamicParams);
for (int j = 0; j < data3.Rows.Count; j++)
{
@@ -416,22 +433,22 @@
//绗竴灞�
sql = @"select distinct A.parent_id from TRight A
inner join TRoleRightRelation B on A.right_code=B.right_code
- where B.role_code='S001' and A.Type='PC' ";
+ where B.role_code=@rolecode and A.Type='APP' ";
dynamicParams.Add("@rolecode", rolecode);
dynamicParams.Add("@type", type);
var date1 = DapperHelper.selectdata(sql, dynamicParams);
TreeDM cmt = new TreeDM();
if (date1.Rows.Count > 0)
{
- cmt.code = "PC";
- cmt.name = "PC";
+ cmt.code = "APP";
+ cmt.name = "APP";
cmt.flag = "Y";
}
else
{
- cmt.code = "PC";
- cmt.name = "PC";
+ cmt.code = "APP";
+ cmt.name = "APP";
cmt.flag = "N";
}
cmt.children = new List<TreeDMOne>();
@@ -459,10 +476,11 @@
from TRight A
left join (
select B.right_code from TRight A
- inner join TRoleRightRelation B on A.right_code=B.right_code where A.parent_id=@right_code
+ inner join TRoleRightRelation B on A.right_code=B.right_code where A.parent_id=@right_code and B.role_code=@rolecode
) C on A.right_code=C.right_code
where A.parent_id=@right_code";
dynamicParams.Add("@right_code", date2.Rows[i]["RIGHT_CODE"].ToString());
+ dynamicParams.Add("@rolecode", rolecode);
var date3 = DapperHelper.selectdata(sql, dynamicParams);
for (int j = 0; j < date3.Rows.Count; j++)
{
--
Gitblit v1.9.3