融入人修改

This commit is contained in:
wyw 2026-03-17 17:39:17 +08:00
parent 74674bd4f1
commit 64953f8130

View File

@ -68,7 +68,8 @@ namespace APT.LR.WebApi.Controllers.Api
{ {
entity.LAW_STATUS = 0; entity.LAW_STATUS = 0;
entity.VERSION_NUM = lawVersion.Where(t => t.UPDATE_TIME == lawVersion.Max(m => m.UPDATE_TIME)).FirstOrDefault().VERSION_NUM;//现行版本号 entity.VERSION_NUM = lawVersion.Where(t => t.UPDATE_TIME == lawVersion.Max(m => m.UPDATE_TIME)).FirstOrDefault().VERSION_NUM;//现行版本号
}else //现行法律 }
else //现行法律
{ {
int versionCount = lawVersion.Count(t => t.VERSION_STATUS == BSLawStatusEnum. && t.IS_DELETED == false); int versionCount = lawVersion.Count(t => t.VERSION_STATUS == BSLawStatusEnum. && t.IS_DELETED == false);
if (versionCount > 1) if (versionCount > 1)
@ -559,11 +560,12 @@ namespace APT.LR.WebApi.Controllers.Api
foreach (var item in listSourse) foreach (var item in listSourse)
{ {
modelCheck = listSourse.FirstOrDefault(e => e.ID == item.ID); modelCheck = listLawData.FirstOrDefault(e => e.ID == item.ID);
if (modelCheck == null) if (modelCheck == null)
{ {
item.CREATER_ID = LoginID; item.CREATER_ID = LoginID;
item.CREATE_TIME = dtNow; item.CREATE_TIME = dtNow;
item.USER_ID = LoginID.Value;
} }
else else
{ {
@ -577,7 +579,7 @@ namespace APT.LR.WebApi.Controllers.Api
foreach (var item in Nav_LawType) foreach (var item in Nav_LawType)
{ {
modelCheckType = listLawType.FirstOrDefault(e => e.ID == item.ID); modelCheckType = listLawTypeData.FirstOrDefault(e => e.ID == item.ID);
if (modelCheckType != null)//如果已经有这种检查类型 直接跳过 if (modelCheckType != null)//如果已经有这种检查类型 直接跳过
continue; continue;