From 14a48ba934fabee90b5d52471ca47883f6007732 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 20 七月 2022 11:40:39 +0800
Subject: [PATCH] Excel 角色清单导入，工序检验扫码
---
VueWebApi/Tools/SeachEncode.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index dce8c51..c265a5d 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -386,17 +386,18 @@
cmp.code = "PC";
cmp.name = "PC";
cmp.flag = "Y";
-
+ cmp.is_delete = "0";
}
else
{
cmp.code = "PC";
cmp.name = "PC";
cmp.flag = "N";
+ cmp.is_delete = "0";
}
cmp.children = new List<TreeDMOne>();
//绗簩灞�
- sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select distinct A.parent_id from TRight A
@@ -412,10 +413,11 @@
cmp1.code = data2.Rows[i]["RIGHT_CODE"].ToString();
cmp1.name = data2.Rows[i]["RIGHT_NAME"].ToString();
cmp1.flag = data2.Rows[i]["FLAG"].ToString();
+ cmp1.is_delete= data2.Rows[i]["IS_DELETE"].ToString();
cmp.children.Add(cmp1);
cmp1.children = new List<TreeDMTwo>();
//绗笁灞�
- sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select B.right_code from TRight A
@@ -431,6 +433,7 @@
cmp2.code = data3.Rows[j]["RIGHT_CODE"].ToString();
cmp2.name = data3.Rows[j]["RIGHT_NAME"].ToString();
cmp2.flag = data3.Rows[j]["FLAG"].ToString();
+ cmp2.is_delete= data3.Rows[j]["IS_DELETE"].ToString();
cmp1.children.Add(cmp2);
}
}
@@ -450,17 +453,18 @@
cmt.code = "APP";
cmt.name = "APP";
cmt.flag = "Y";
-
+ cmt.is_delete = "1";
}
else
{
cmt.code = "APP";
cmt.name = "APP";
cmt.flag = "N";
+ cmt.is_delete = "1";
}
cmt.children = new List<TreeDMOne>();
//绗簩灞�
- sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select distinct A.parent_id from TRight A
@@ -476,10 +480,11 @@
cmt1.code = date2.Rows[i]["RIGHT_CODE"].ToString();
cmt1.name = date2.Rows[i]["RIGHT_NAME"].ToString();
cmt1.flag = date2.Rows[i]["FLAG"].ToString();
+ cmt1.is_delete= date2.Rows[i]["IS_DELETE"].ToString();
cmt.children.Add(cmt1);
cmt1.children = new List<TreeDMTwo>();
//绗笁灞�
- sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select B.right_code from TRight A
@@ -495,6 +500,7 @@
cmt2.code = date3.Rows[j]["RIGHT_CODE"].ToString();
cmt2.name = date3.Rows[j]["RIGHT_NAME"].ToString();
cmt2.flag = date3.Rows[j]["FLAG"].ToString();
+ cmt2.flag= date3.Rows[j]["IS_DELETE"].ToString();
cmt1.children.Add(cmt2);
}
}
--
Gitblit v1.9.3