Commit 51b9383f authored by liudong1993's avatar liudong1993

1

parent 8366175b
...@@ -6478,6 +6478,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time ...@@ -6478,6 +6478,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
y.ProgressState, y.ProgressState,
ProgressStateName = y.ProgressState.ToName(), ProgressStateName = y.ProgressState.ToName(),
y.ParentNum, y.ParentNum,
UserId = y.CreateBy,
y.EmName, y.EmName,
y.EmPhoto y.EmPhoto
}); });
...@@ -6665,6 +6666,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time ...@@ -6665,6 +6666,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
y.ProgressState, y.ProgressState,
ProgressStateName = y.ProgressState.ToName(), ProgressStateName = y.ProgressState.ToName(),
y.ChildNum, y.ChildNum,
UserId = y.CreateBy,
y.EmName, y.EmName,
y.EmPhoto y.EmPhoto
}); });
......
...@@ -1096,7 +1096,6 @@ namespace Edu.WebApi.Controllers.OKR ...@@ -1096,7 +1096,6 @@ namespace Edu.WebApi.Controllers.OKR
[HttpPost] [HttpPost]
public ApiResult GetOKROthersObjectiveInfo() public ApiResult GetOKROthersObjectiveInfo()
{ {
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
JObject parms = JObject.Parse(RequestParm.Msg.ToString()); JObject parms = JObject.Parse(RequestParm.Msg.ToString());
int ObjectiveId = parms.GetInt("ObjectiveId", 0); int ObjectiveId = parms.GetInt("ObjectiveId", 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment