wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:5cdff2aaf1d08ba89ae139f74451da31d2533b76
Branches Tags
wyw:master
..
compare: wyw:f912d062ff629416f23d71669f5543085fba5659
Branches Tags
wyw:master

No commits in common. "5cdff2aaf1d08ba89ae139f74451da31d2533b76" and "f912d062ff629416f23d71669f5543085fba5659" have entirely different histories.
5cdff2aaf1 ... f912d062ff

1 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

8
APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs
View File

@ -68,8 +68,7 @@ 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)
@ -560,12 +559,11 @@ namespace APT.LR.WebApi.Controllers.Api
foreach (var item in listSourse) foreach (var item in listSourse)
{ {
modelCheck = listLawData.FirstOrDefault(e => e.ID == item.ID); modelCheck = listSourse.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
{ {
@ -579,7 +577,7 @@ namespace APT.LR.WebApi.Controllers.Api
foreach (var item in Nav_LawType) foreach (var item in Nav_LawType)
{ {
modelCheckType = listLawTypeData.FirstOrDefault(e => e.ID == item.ID); modelCheckType = listLawType.FirstOrDefault(e => e.ID == item.ID);
if (modelCheckType != null)//如果已经有这种检查类型 直接跳过 if (modelCheckType != null)//如果已经有这种检查类型 直接跳过
continue; continue;