Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -248,8 +248,9 @@ namespace CallCenterApi.Interface.Controllers
                 try
                 {
                     Dictionary<string, string> paras = new Dictionary<string, string>();
-                    string sql = " select * from T_Sys_UserAccount where F_UserCode=@F_UserCode and F_PassWord=@F_PassWord and F_DeleteFlag=0";
+                    string sql = " select * from T_Sys_UserAccount where (F_UserCode=@F_UserCode or F_UserName=@F_UserName) and F_PassWord=@F_PassWord and F_DeleteFlag=0";
                     paras.Add("@F_UserCode", login.Username);
+                    paras.Add("@F_UserName", login.Username);
                     paras.Add("@F_PassWord", login.Password);
 
                     dt = DbHelperSQL.Query(sql, paras).Tables[0];
@@ -340,7 +341,13 @@ namespace CallCenterApi.Interface.Controllers
                     else
                     {
                         //写入登录日志
-                        DataTable dt1 = new CallCenterApi.BLL.T_Sys_UserAccount().GetList("F_UserCode='" + login.Username + "'").Tables[0];
+                        //DataTable dt1 = new CallCenterApi.BLL.T_Sys_UserAccount().GetList("F_UserCode='" + login.Username + "'").Tables[0];
+                        Dictionary<string, string> paras1 = new Dictionary<string, string>();
+
+                        string sql1 = " select * from T_Sys_UserAccount where F_UserCode=@F_UserCode or F_UserName=@F_UserName ";
+                        paras1.Add("@F_UserCode", login.Username);
+                        paras1.Add("@F_UserName", login.Username);
+                        var dt1 = DbHelperSQL.Query(sql1, paras1).Tables[0];
                         if (dt1.Rows.Count > 0)
                         {
                             int rr = new CallCenterApi.BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()