lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20220925 人员登录接口修改

This commit is contained in:
杨红卫 2022-09-25 17:46:49 +08:00
parent 5e4a7de2ac
commit 0bbeca57e6
8 changed files with 102 additions and 1284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
DataBase/版本日志/SGGLDB_V2022-09-22.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-22.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-09-22修改明细.txt → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-22修改明细.txt
View File

0
DataBase/版本日志/SGGLDB_V2022-09-23 lpf.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-23.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-09-23 修改明细.txt → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-23修改明细.txt
View File

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

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

11
SGGL/BLL/API/APIUserService.cs
View File

@ -16,15 +16,8 @@ namespace BLL
{ {
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
var getUser = db.Person_Persons.FirstOrDefault(x =>( x.Account == userInfo.Account || x.Telephone == userInfo.Telephone || x.PersonName == userInfo.Account)
var getPersons = db.Person_Persons.Where(x => !x.IsPost.HasValue || x.IsPost == true); && x.Password == Funs.EncryptionPassword(userInfo.Password) && (!x.IsPost.HasValue || x.IsPost == true) && x.RoleIds != null);
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);
}
if (getUser != null) if (getUser != null)
{ {
Model.UserItem newItem = new Model.UserItem(); Model.UserItem newItem = new Model.UserItem();

20
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -73,21 +73,17 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll</HintPath> <HintPath>..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="FastReport, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL"> <Reference Include="FastReport">
<SpecificVersion>False</SpecificVersion> <HintPath>..\FineUIPro\Reference BLL\FastReport.dll</HintPath>
<HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.dll</HintPath>
</Reference> </Reference>
<Reference Include="FastReport.Bars, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL"> <Reference Include="FastReport.Bars">
<SpecificVersion>False</SpecificVersion> <HintPath>..\FineUIPro\Reference BLL\FastReport.Bars.dll</HintPath>
<HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.Bars.dll</HintPath>
</Reference> </Reference>
<Reference Include="FastReport.Editor, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL"> <Reference Include="FastReport.Editor">
<SpecificVersion>False</SpecificVersion> <HintPath>..\FineUIPro\Reference BLL\FastReport.Editor.dll</HintPath>
<HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="FastReport.Web, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL"> <Reference Include="FastReport.Web">
<SpecificVersion>False</SpecificVersion> <HintPath>..\FineUIPro\Reference BLL\FastReport.Web.dll</HintPath>
<HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.Web.dll</HintPath>
</Reference> </Reference>
<Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL"> <Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>

1350
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff