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

202305291、修改奖励通知单、奖惩通知单。

Browse Source
This commit is contained in:
杨红卫
2023-05-29 09:09:30 +08:00
parent cd3d51ae3f
commit 9c804196e7
43 changed files with 3070 additions and 3544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APICommonService.cs
+2 -2
View File
@@ -80,11 +80,11 @@
var getUser = db.Person_Persons.FirstOrDefault(x => x.PersonId == personId);
if (getUser != null && !string.IsNullOrEmpty(getUser.OpenId))
{
if (thing2.Length > 20)
if (!string.IsNullOrEmpty(thing2) && thing2.Length > 20)
{
thing2 = thing2.Substring(0, 20);
}
if (name1.Length > 10)
if (!string.IsNullOrEmpty(name1) && name1.Length > 10)
{
name1 = name1.Substring(0, 10);
}
SGGL/BLL/API/APIPersonService.cs
+10 -1
View File
@@ -133,7 +133,7 @@ namespace BLL
person.AttachUrl2 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId + "#2", null);
person.AttachUrl3 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId + "#3", null);
person.AttachUrl4 = getAttachUrl4(getProjectPerson.PersonId);
//person.AttachUrl5 = APIUpLoadFileService.getFileUrl(personId + "#5", null);
person.AttachUrl5 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId + "#5", null);
}
var getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == idcard);
if (getPerson != null)
@@ -742,6 +742,15 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == person.IdentityCard || x.PersonId == person.PersonId);
if (getPerson == null)
{
var getSitePerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId ==person.PersonId);
if (getSitePerson != null)
{
getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == getSitePerson.IdentityCard || x.PersonId == getSitePerson.PersonId);
}
}
if (getPerson != null)
{
if (!string.IsNullOrEmpty(person.PhotoUrl))