|
|
@ -60,7 +60,23 @@ namespace Tiobon.Core.Services |
|
|
|
|
|
|
|
|
|
|
|
var StaffGroupDetail = await _StaffGroupDetailServices.Query(x => x.StaffGroupID == body.id); |
|
|
|
var StaffGroupDetail = await _StaffGroupDetailServices.Query(x => x.StaffGroupID == body.id); |
|
|
|
result.result.DT_TableDataT1[0].StaffGroupDetail = StaffGroupDetail.OrderBy(x => x.SortNo).ToList(); |
|
|
|
result.result.DT_TableDataT1[0].StaffGroupDetail = StaffGroupDetail.OrderBy(x => x.SortNo).ToList(); |
|
|
|
|
|
|
|
result.result.DT_TableDataT1[0].StaffGroupDetail.ForEach((x) => |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (x.FieldValue != null) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (JsonHelper.IsJson(x.FieldValue.ToString())) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
try |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
x.FieldValue = JsonHelper.JsonToObj<List<int>>(x.FieldValue.ToString()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
catch (Exception) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
x.FieldValue = JsonHelper.JsonToObj<List<string>>(x.FieldValue.ToString()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
if (body.doType == "Copy") |
|
|
|
if (body.doType == "Copy") |
|
|
|
{ |
|
|
|
{ |
|
|
|
result.result.DT_TableDataT1[0].StaffGroupNo = null; |
|
|
|
result.result.DT_TableDataT1[0].StaffGroupNo = null; |
|
|
@ -117,7 +133,7 @@ namespace Tiobon.Core.Services |
|
|
|
and StaffInfoColumnNo != 'AttachmentIDs' ";
|
|
|
|
and StaffInfoColumnNo != 'AttachmentIDs' ";
|
|
|
|
|
|
|
|
|
|
|
|
var result = Db.Ado.SqlQuery<StaffInfoColumn>(sql); |
|
|
|
var result = Db.Ado.SqlQuery<StaffInfoColumn>(sql); |
|
|
|
result.ForEach( x => |
|
|
|
result.ForEach(x => |
|
|
|
{ |
|
|
|
{ |
|
|
|
x.operatorData = JsonConvert.DeserializeObject<List<OperatorData>>(x.OperatorDataStr); |
|
|
|
x.operatorData = JsonConvert.DeserializeObject<List<OperatorData>>(x.OperatorDataStr); |
|
|
|
}); |
|
|
|
}); |
|
|
@ -133,7 +149,7 @@ namespace Tiobon.Core.Services |
|
|
|
public string dataSourceType { get; set; } |
|
|
|
public string dataSourceType { get; set; } |
|
|
|
public string dataSource { get; set; } |
|
|
|
public string dataSource { get; set; } |
|
|
|
public int multipleSelectInt { get; set; } |
|
|
|
public int multipleSelectInt { get; set; } |
|
|
|
public bool multipleSelect => multipleSelectInt==1?true :false; |
|
|
|
public bool multipleSelect => multipleSelectInt == 1 ? true : false; |
|
|
|
public string OperatorDataStr { get; set; } |
|
|
|
public string OperatorDataStr { get; set; } |
|
|
|
public List<OperatorData> operatorData { get; set; } |
|
|
|
public List<OperatorData> operatorData { get; set; } |
|
|
|
} |
|
|
|
} |
|
|
|