From 925394b1b7f61a2c2a15fdaa0ecd0763214ccda1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 30 五月 2023 18:01:29 +0800
Subject: [PATCH] 增加App报工、工序检验功能

---
 VueWebApi/DLL/DAL/LoginDAL.cs |   39 ++++++++++++++++++---------------------
 1 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/VueWebApi/DLL/DAL/LoginDAL.cs b/VueWebApi/DLL/DAL/LoginDAL.cs
index eec617d..3696164 100644
--- a/VueWebApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebApi/DLL/DAL/LoginDAL.cs
@@ -1,6 +1,7 @@
 锘縰sing Dapper;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
@@ -19,13 +20,17 @@
         public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
         public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
         public static string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
+        //鑾峰彇浼佷笟閰嶇疆Enterprise
+        private static readonly string Enterprise = ConfigurationManager.AppSettings["Enterprise"];
 
         #region [鐧诲綍鏌ヨ]
         public static DataTable LoginSearch(string username, string password)
         {
 
             //鎵цsql
-            strProcName = "select *  from [dbo].[TUser] where usercode=@username and password=@password and is_delete='0'";
+            strProcName = @"select *  from [dbo].[TUser] U 
+                            left join TGroup G on U.usergroup_code = G.group_code 
+                            where U.usercode=@username and U.password=@password and U.is_delete='0'";
             //鍒涘缓鍙傛暟
             listStr.Add(new SqlParameter("@username", username));
             listStr.Add(new SqlParameter("@password", password));
@@ -131,12 +136,13 @@
                 }).ToList();
                 for (int i = 0; i < data.Count; i++)
                 {
-                    sql = @"select distinct mu.right_code as code,mu.right_name as name,mu.right_seq,mu.is_delete as flag,imgurl
+                    sql = @"select *  from(
+                            select distinct mu.right_code as code,mu.right_name as name,mu.right_seq,mu.is_delete as flag,imgurl
 							from TRight mu
                             inner join TRoleRightRelation rl on mu.right_code=rl.right_code
                             inner join TUserRoleRelation ro on rl.role_code=ro.role_code
                             where mu.type=@usertype and ro.user_code=@usercode and mu.parent_id=@paent_id 
-							order by mu.right_seq, mu.right_code";
+                            ) as AA order by  CAST(AA.right_seq AS DECIMAL) ASC,AA.code";
                     dynamicParams.Add("@usercode", usercode);
                     dynamicParams.Add("@usertype", usertype);
                     dynamicParams.Add("@paent_id", data[i].code);
@@ -163,7 +169,7 @@
         }
         #endregion
 
-      
+
 
         #region[淇敼瀵嗙爜]
         public static ToMessage UpdateUserPassword(string usercode, string username, string password, string newpassword)
@@ -239,7 +245,7 @@
                 cont = DapperHelper.SQL(sql, dynamicParams);
                 if (cont > 0)
                 {
-                    redis.Remove("LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
+                    redis.Remove(Enterprise+"LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
                     mes.code = "200";
                     mes.count = 0;
                     mes.Message = "鐧诲嚭鎴愬姛!";
@@ -313,29 +319,20 @@
             try
             {
                 sql = @"select B.eqp_code,E.name as eqp_name,B.wkshp_code,T.org_name as wkshp_name,
-                        A.tpye as typecode,D.name as typename,B.start_user,B.start_date   
+                        A.type as typecode,D.name as typename,B.start_user,B.start_date   
                         from TAnDnMessagePush A
                         inner join TAnDon_Task_Info B on A.m_id=B.id
                         left  join TEqpInfo E on B.eqp_code=E.code
                         left  join TOrganization T on B.wkshp_code=T.org_code 
-                        left  join TAnDonType D on A.tpye=d.code
+                        left  join TAnDonType D on A.type=d.code
                         where A.resp_user=@username and B.status='START' and T.description='W'";
                 dynamicParams.Add("@username", username);
                 var data = DapperHelper.selectdata(sql, dynamicParams);
-                if (data.Rows.Count > 0)
-                {
-                    mes.code = "200";
-                    mes.count = 0;
-                    mes.Message = "鏌ヨ鎴愬姛!";
-                    mes.data = data;
-                }
-                else
-                {
-                    mes.code = "300";
-                    mes.count = 0;
-                    mes.Message = "鏌ヨ澶辫触!";
-                    mes.data = null;
-                }
+
+                mes.code = "200";
+                mes.count = 0;
+                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.data = data;
             }
             catch (Exception e)
             {

--
Gitblit v1.9.3