yuanrf před 3 měsíci
rodič
revize
83314b744d

+ 2 - 1
OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -2120,6 +2120,7 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
                         .Select((a, b, c) => new TreeNode
                         {
                             Id = a.Id,
+                            ContentId = b.Id,
                             Name = a.Name,
                             ParentId = a.ParentId,
                             AssessmentProportion = a.AssessmentProportion, //占比
@@ -2352,7 +2353,7 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
                                                        b.AssessmentStandard,
                                                        MergeStr = $"【项名称:{b.Name}/目标值:{a.TargetValue}/评估标准:{b.AssessmentStandard}】",
                                                        a.AssessmentProportionChi,
-                                                        b.Name
+                                                       b.Name
                                                    })
                                                    .ToList()
                                                    .ToDictionary(x => x.ContentSettingId);

+ 2 - 0
OASystem/OASystem.Domain/Dtos/PersonnelModule/TreeNode.cs

@@ -10,6 +10,8 @@ namespace OASystem.Domain.Dtos.PersonnelModule
     public class TreeNode
     {
         public int Id { get; set; }
+
+        public int ContentId { get; set; }
         public string Name { get; set; }
         /// <summary>
         /// 考核占比