diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffGroupDetail.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffGroupDetail.Dto.Base.cs
index 08d1dcd1..8fb7f8b3 100644
--- a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffGroupDetail.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffGroupDetail.Dto.Base.cs
@@ -47,7 +47,7 @@ namespace Tiobon.Core.Model.Models
/// 字段所选值
///
[Display(Name = "FieldValue"), Description("字段所选值"), MaxLength(-1, ErrorMessage = "字段所选值 不能超过 -1 个字符")]
- public string FieldValue { get; set; }
+ public object FieldValue { get; set; }
///
/// 备注
diff --git a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffGroupDetail.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffGroupDetail.cs
index 0251e3cb..8da0322d 100644
--- a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffGroupDetail.cs
+++ b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffGroupDetail.cs
@@ -49,7 +49,7 @@ namespace Tiobon.Core.Model.Models
/// 字段所选值
///
[Display(Name = "FieldValue"), Description("字段所选值"), MaxLength(-1, ErrorMessage = "字段所选值 不能超过 -1 个字符")]
- public string FieldValue { get; set; }
+ public object FieldValue { get; set; }
///
/// 备注
diff --git a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs
index 5dd8c351..702f5b31 100644
--- a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs
+++ b/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs
@@ -60,7 +60,23 @@ namespace Tiobon.Core.Services
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.ForEach((x) =>
+ {
+ if (x.FieldValue != null)
+ {
+ if (JsonHelper.IsJson(x.FieldValue.ToString()))
+ {
+ try
+ {
+ x.FieldValue = JsonHelper.JsonToObj>(x.FieldValue.ToString());
+ }
+ catch (Exception)
+ {
+ x.FieldValue = JsonHelper.JsonToObj>(x.FieldValue.ToString());
+ }
+ }
+ }
+ });
if (body.doType == "Copy")
{
result.result.DT_TableDataT1[0].StaffGroupNo = null;
@@ -82,8 +98,8 @@ namespace Tiobon.Core.Services
return result;
}
- public async Task> GetStaffInfoColumnData()
- {
+ public async Task> GetStaffInfoColumnData()
+ {
string sql = @$"select StaffInfoColumnNo,
dbo.FLangKeyToValue(MKey,1,StaffInfoColumnName) StaffInfoColumnName,
ColumnType elementType,
@@ -115,34 +131,34 @@ namespace Tiobon.Core.Services
and StaffInfoGroupId = 1
and IsRelease = 1
and StaffInfoColumnNo != 'AttachmentIDs' ";
-
+
var result = Db.Ado.SqlQuery(sql);
- result.ForEach( x =>
+ result.ForEach(x =>
{
- x.operatorData = JsonConvert.DeserializeObject>(x.OperatorDataStr);
+ x.operatorData = JsonConvert.DeserializeObject>(x.OperatorDataStr);
});
return ServiceResult