OKR调整

Edu.Model/ViewModel/OKR/RB_OKR_RuleRelation_ViewModel.cs

@@ -18,5 +18,20 @@ namespace Edu.Model.ViewModel.OKR
         /// 关联部门/人员名称
         /// </summary>
         public string RelationName { get; set; }
+
+        /// <summary>
+        /// 用户头像
+        /// </summary>
+        public string UserIcon { get; set; }
+
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string PostName { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DeptName { get; set; }
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -1357,12 +1357,13 @@ namespace Edu.WebApi.Controllers.OKR
             var userInfo = base.UserInfo;
             var dmodel = JsonHelper.DeserializeObject<RB_OKR_Rule_ViewModel>(RequestParm.Msg.ToString());
             dmodel.Group_Id = userInfo.Group_Id;
-
+            dmodel.Enable = 1;
             var list = okrPeriodModule.GetOKRRuleDownLoadList(dmodel);
             return ApiResult.Success("", list.Select(x => new
             {
                 x.Id,
                 x.RuleName,
+                x.Remark
             }));
         }
 
@@ -1538,7 +1539,10 @@ namespace Edu.WebApi.Controllers.OKR
                 x.Id,
                 x.Type,
                 x.RelationId,
-                x.RelationName
+                x.RelationName,
+                x.UserIcon,
+                x.PostName,
+                x.DeptName
             }));
         }