Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

2022-10-08 15:26:13 +08:00
parent ccb0a6152b 04babbce4a
commit 4ad6950292
9 changed files with 104 additions and 1285 deletions
@@ -0,0 +1,5 @@
+--ADD BY YangHongwei 2022-09-25
+1、人员登录小程序接口方法修改。
+--END
+
+ 
@@ -16,15 +16,9 @@ namespace BLL
        {
            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
-
-                var getPersons = db.Person_Persons.Where(x => !x.IsPost.HasValue || x.IsPost == true);
-                var getUser = getPersons.FirstOrDefault(x => x.Account == userInfo.Account && x.Password == Funs.EncryptionPassword(userInfo.Password));
-                if (getUser == null)
-                {
-                    getUser = getPersons.FirstOrDefault(x => (x.Telephone == userInfo.Telephone || x.PersonName == userInfo.Account)
-                               && x.IdentityCard != null && x.IdentityCard.Substring(x.IdentityCard.Length - 4) == userInfo.Password);
-                }
-
+                var getUser = db.Person_Persons.FirstOrDefault(x =>( x.Account == userInfo.Account || x.Telephone == userInfo.Telephone || x.PersonName == userInfo.Account) 
+                && x.Password == Funs.EncryptionPassword(userInfo.Password)  && (!x.IsPost.HasValue || x.IsPost == true) 
+                && (x.Account != null || x.PersonId == Const.hfnbdId || x.PersonId == Const.sysglyId));
                if (getUser != null)
                {
                    Model.UserItem newItem = new Model.UserItem();
@@ -195,7 +195,7 @@ namespace BLL
                string clientId = SynchroSet.ClientId;
                string userName = SynchroSet.UserName;
                string password = Funs.EncryptionPassword(SynchroSet.Password);
-                string timestamp = string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now.AddMinutes(-2));
+                string timestamp = string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now.AddMinutes(-3));
                string sign = Funs.EncryptionPassword(clientId + userName + password + timestamp);
                var getToken = new
                {
@@ -73,21 +73,17 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll</HintPath>
    </Reference>
-    <Reference Include="FastReport, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.dll</HintPath>
+    <Reference Include="FastReport">
+      <HintPath>..\FineUIPro\Reference BLL\FastReport.dll</HintPath>
    </Reference>
-    <Reference Include="FastReport.Bars, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.Bars.dll</HintPath>
+    <Reference Include="FastReport.Bars">
+      <HintPath>..\FineUIPro\Reference BLL\FastReport.Bars.dll</HintPath>
    </Reference>
-    <Reference Include="FastReport.Editor, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.Editor.dll</HintPath>
+    <Reference Include="FastReport.Editor">
+      <HintPath>..\FineUIPro\Reference BLL\FastReport.Editor.dll</HintPath>
    </Reference>
-    <Reference Include="FastReport.Web, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.Web.dll</HintPath>
+    <Reference Include="FastReport.Web">
+      <HintPath>..\FineUIPro\Reference BLL\FastReport.Web.dll</HintPath>
    </Reference>
    <Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>