add check id > 0 before assign
This commit is contained in:
@@ -16,7 +16,7 @@
|
|||||||
"IIS Express": {
|
"IIS Express": {
|
||||||
"commandName": "IISExpress",
|
"commandName": "IISExpress",
|
||||||
"launchBrowser": true,
|
"launchBrowser": true,
|
||||||
"launchUrl": "api/v1/LookupCode/ConcessionTypes",
|
"launchUrl": "swagger",
|
||||||
"environmentVariables": {
|
"environmentVariables": {
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ namespace CarParkValidationAPI.Repository
|
|||||||
|
|
||||||
private AdminUser FillAdminUser(AdminUserDto dto, AdminUser model)
|
private AdminUser FillAdminUser(AdminUserDto dto, AdminUser model)
|
||||||
{
|
{
|
||||||
|
if (dto.Id > 0)
|
||||||
model.UserID = dto.Id;
|
model.UserID = dto.Id;
|
||||||
model.Name = dto.Name;
|
model.Name = dto.Name;
|
||||||
model.RoleType = dto.RoleType;
|
model.RoleType = dto.RoleType;
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ namespace CarParkValidationAPI.Repository
|
|||||||
model.ConcessionDesc = dto.Description.Trim();
|
model.ConcessionDesc = dto.Description.Trim();
|
||||||
if (!string.IsNullOrEmpty(dto.Display))
|
if (!string.IsNullOrEmpty(dto.Display))
|
||||||
model.ConcessionDisplay = dto.Display.Trim();
|
model.ConcessionDisplay = dto.Display.Trim();
|
||||||
|
if (dto.Id > 0)
|
||||||
model.ConcessionTypeID = dto.Id;
|
model.ConcessionTypeID = dto.Id;
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ namespace CarParkValidationAPI.Repository
|
|||||||
model.ConcessionExpiry = dto.ConcessionExpiry;
|
model.ConcessionExpiry = dto.ConcessionExpiry;
|
||||||
model.ConcessionHolder = dto.ConcessionHolder.Trim();
|
model.ConcessionHolder = dto.ConcessionHolder.Trim();
|
||||||
model.ConcessionTypeID = dto.ConcessionTypeId;
|
model.ConcessionTypeID = dto.ConcessionTypeId;
|
||||||
|
if (dto.Id > 0)
|
||||||
model.ValidationID = dto.Id;
|
model.ValidationID = dto.Id;
|
||||||
model.StafflinkNo = dto.StafflinkNo;
|
model.StafflinkNo = dto.StafflinkNo;
|
||||||
model.StaffFirstName = dto.StaffFirstName.Trim();
|
model.StaffFirstName = dto.StaffFirstName.Trim();
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ namespace CarParkValidationAPI.Repository
|
|||||||
model.Description = item.Description.Trim();
|
model.Description = item.Description.Trim();
|
||||||
if (!string.IsNullOrEmpty(item.Display))
|
if (!string.IsNullOrEmpty(item.Display))
|
||||||
model.DisplayName = item.Display.Trim();
|
model.DisplayName = item.Display.Trim();
|
||||||
|
if (item.Id > 0)
|
||||||
model.ValidationPointID = item.Id;
|
model.ValidationPointID = item.Id;
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
{
|
{
|
||||||
"AppSettings": {
|
|
||||||
"Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.",
|
|
||||||
"SQLConnectionString": "Server=NEPHICT-040931L;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
|
|
||||||
"LDAPPath": "",
|
|
||||||
"LDAPUser": "S",
|
|
||||||
"LDAPPassword": "",
|
|
||||||
"ADTimeOut": "30",
|
|
||||||
"LoginWebAPI": "http://NEPHMDB-SQL007/CommonWebApiAD/api/AD"
|
|
||||||
},
|
|
||||||
"Logging": {
|
"Logging": {
|
||||||
"LogLevel": {
|
"LogLevel": {
|
||||||
"Default": "Information",
|
"Default": "Information",
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"AppSettings": {
|
"AppSettings": {
|
||||||
"Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.",
|
"Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.",
|
||||||
"SQLConnectionString": "Server=NEPHICT-040931L;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
|
"SQLConnectionString": "Server=NEPHMDB-SQL007;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
|
||||||
"LDAPPath": "",
|
"LDAPPath": "",
|
||||||
"LDAPUser": "S",
|
"LDAPUser": "S",
|
||||||
"LDAPPassword": "",
|
"LDAPPassword": "",
|
||||||
|
|||||||
Reference in New Issue
Block a user