diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 09653f8f..6a88a714 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -79,7 +79,7 @@ - ..\..\..\SGGL\SGGL\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll + ..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll diff --git a/SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2021-08/202108131156459133~测验人员.jpg b/SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2021-08/202108131156459133~测验人员.jpg new file mode 100644 index 00000000..db3fd5d0 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2021-08/202108131156459133~测验人员.jpg differ diff --git a/SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2021-08/202108131158502927~测验人员.jpg b/SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2021-08/202108131158502927~测验人员.jpg new file mode 100644 index 00000000..db3fd5d0 Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2021-08/202108131158502927~测验人员.jpg differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 79470adc..90e70345 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -70,7 +70,7 @@ ..\..\..\CQMS_New\CQMS\FineUIPro.Web\bin\Aspose.Words.dll - ..\..\..\SGGL\SGGL\FineUIPro.Web\bin\AxInterop.SYNCARDOCXLib.dll + ..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll False @@ -79,7 +79,7 @@ False False - ..\..\..\SGGL\SGGL\FineUIPro.Web\bin\Interop.WIA.dll + ..\FineUIPro\Reference BLL\Interop.WIA.dll @@ -117,7 +117,7 @@ False - ..\..\..\SGGL\SGGL\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll + ..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll FakesAssemblies\ThoughtWorks.QRCode.Fakes.dll diff --git a/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs b/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs index a27ec414..e36e0a70 100644 --- a/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs +++ b/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs @@ -171,7 +171,7 @@ namespace WebAPI.Controllers OutResult = person.OutResult, Birthday = person.Birthday, Telephone = person.Telephone, - IsUsed = person.IsUsed, + IsUsed = person.IsUsed == false ? false : true, InTime = Funs.GetNewDateTimeOrNow(person.InTime), Password = BLL.PersonService.GetPersonPassWord(person.IdentityCard), Isprint = "0",