From c63b40452aeaf1b46ef716da9f5dc9e8c2a843a6 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 七月 2022 20:30:33 +0800
Subject: [PATCH] 生产开报工提交

---
 VueWebApi/Tools/SeachEncode.cs |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index 0e7485b..dce8c51 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -23,6 +23,7 @@
             int digit2, value2, digit3, digitdiff;
             bool stf;
             List<object> list = new List<object>();
+            List<string> listdt = new List<string>();
             var dynamicParams = new DynamicParameters();
             try
             {
@@ -67,16 +68,18 @@
                                 }
                                 Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
 
-                                sql = @"update T_CodeRules set value=@cunm2  where rightcode=@rightcode";
-                                dynamicParams.Add("@cunm2", cunm2);
-                                dynamicParams.Add("@rightcode", rightcode);
-                                list.Add(new { str = sql, parm = dynamicParams });
+                                //sql = @"update T_CodeRules set value=@cunm2  where rightcode=@rightcode";
+                                //dynamicParams.Add("@cunm2", cunm2);
+                                //dynamicParams.Add("@rightcode", rightcode);
+                                //list.Add(new { str = sql, parm = dynamicParams });
                                 stf = DapperHelper.DoTransaction(list);
                                 if (stf)
                                 {
+                                    listdt.Add(Encode);
+                                    listdt.Add(cunm2);
                                     mes.code = "200";
                                     mes.Message = "鎴愬姛!";
-                                    mes.data = Encode;
+                                    mes.data = listdt;
                                 }
                                 else
                                 {
@@ -114,16 +117,18 @@
                                 Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
 
 
-                                sql = @"update T_CodeRules set value=@cunm2  where rightcode=@rightcode";
-                                dynamicParams.Add("@cunm2", cunm2);
-                                dynamicParams.Add("@rightcode", rightcode);
-                                list.Add(new { str = sql, parm = dynamicParams });
+                                //sql = @"update T_CodeRules set value=@cunm2  where rightcode=@rightcode";
+                                //dynamicParams.Add("@cunm2", cunm2);
+                                //dynamicParams.Add("@rightcode", rightcode);
+                                //list.Add(new { str = sql, parm = dynamicParams });
                                 stf = DapperHelper.DoTransaction(list);
                                 if (stf)
                                 {
+                                    listdt.Add(Encode);
+                                    listdt.Add(cunm2);
                                     mes.code = "200";
                                     mes.Message = "鎴愬姛!";
-                                    mes.data = Encode;
+                                    mes.data = listdt;
                                 }
                                 else
                                 {
@@ -159,16 +164,18 @@
                                 }
                                 Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
 
-                                sql = @"update T_CodeRules set value=@cunm2  where rightcode=@rightcode";
-                                dynamicParams.Add("@cunm2", cunm2);
-                                dynamicParams.Add("@rightcode", rightcode);
-                                list.Add(new { str = sql, parm = dynamicParams });
+                                //sql = @"update T_CodeRules set value=@cunm2  where rightcode=@rightcode";
+                                //dynamicParams.Add("@cunm2", cunm2);
+                                //dynamicParams.Add("@rightcode", rightcode);
+                                //list.Add(new { str = sql, parm = dynamicParams });
                                 stf = DapperHelper.DoTransaction(list);
                                 if (stf)
                                 {
+                                    listdt.Add(Encode);
+                                    listdt.Add(cunm2);
                                     mes.code = "200";
                                     mes.Message = "鎴愬姛!";
-                                    mes.data = Encode;
+                                    mes.data = listdt;
                                 }
                                 else
                                 {
@@ -369,7 +376,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);
@@ -412,10 +419,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++)
                         {
@@ -432,22 +440,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>();
@@ -475,10 +483,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