20220925 人员登录接口修改

DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-25修改明细.txt

@@ -0,0 +1,5 @@
+--ADD BY YangHongwei 2022-09-25
+1、人员登录小程序接口方法修改。
+--END
+
+ 

SGGL/BLL/API/APIUserService.cs

@@ -16,15 +16,8 @@ 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.RoleIds != null);
                 if (getUser != null)
                 {
                     Model.UserItem newItem = new Model.UserItem();

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -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>