Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.OKR/OKRPeriodModule.cs

@@ -6256,6 +6256,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                 x.Status,
                 x.EmName,
                 x.EmPhoto,
+                UserId = x.CreateBy,
                 ParentList = x.ParentSingleList.Select(y => new
                 {
                     y.Id,
@@ -6267,6 +6268,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                     y.ProgressState,
                     ProgressStateName = y.ProgressState.ToName(),
                     y.ParentNum,
+                    UserId = y.CreateBy,
                     y.EmName,
                     y.EmPhoto
                 }),
@@ -6281,6 +6283,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                     y.ProgressState,
                     ProgressStateName = y.ProgressState.ToName(),
                     y.ChildNum,
+                    UserId = y.CreateBy,
                     y.EmName,
                     y.EmPhoto
                 }),
@@ -6478,6 +6481,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                     y.ProgressState,
                     ProgressStateName = y.ProgressState.ToName(),
                     y.ParentNum,
+                    UserId = y.CreateBy,
                     y.EmName,
                     y.EmPhoto
                 });
@@ -6665,6 +6669,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                     y.ProgressState,
                     ProgressStateName = y.ProgressState.ToName(),
                     y.ChildNum,
+                    UserId = y.CreateBy,
                     y.EmName,
                     y.EmPhoto
                 });
@@ -6766,6 +6771,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                 x.ProgressState,
                 ProgressStateName = x.ProgressState.ToName(),
                 x.Status,
+                UserId = x.CreateBy,
                 x.EmName,
                 x.EmPhoto,
                 ParentList = x.ParentSingleList.Select(y => new
@@ -6779,6 +6785,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                     IsNotLook = 2,
                     ProgressStateName = y.ProgressState.ToName(),
                     y.ParentNum,
+                    UserId = y.CreateBy,
                     y.EmName,
                     y.EmPhoto
                 }),
@@ -6793,6 +6800,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                     IsNotLook = 2,
                     ProgressStateName = y.ProgressState.ToName(),
                     y.ChildNum,
+                    UserId = y.CreateBy,
                     y.EmName,
                     y.EmPhoto
                 }),
@@ -6852,6 +6860,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                     IsNotLook = 2,
                     ProgressStateName = y.ProgressState.ToName(),
                     y.ParentNum,
+                    UserId = y.CreateBy,
                     y.EmName,
                     y.EmPhoto
                 });
@@ -6899,6 +6908,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                     IsNotLook = 2,
                     ProgressStateName = y.ProgressState.ToName(),
                     y.ChildNum,
+                    UserId = y.CreateBy,
                     y.EmName,
                     y.EmPhoto
                 });

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -1096,7 +1096,6 @@ namespace Edu.WebApi.Controllers.OKR
         [HttpPost]
         public ApiResult GetOKROthersObjectiveInfo()
         {
-
             var userInfo = base.UserInfo;
             JObject parms = JObject.Parse(RequestParm.Msg.ToString());
             int ObjectiveId = parms.GetInt("ObjectiveId", 0);