页面修改

Edu.Module.OKR/OKRPeriodModule.cs

@@ -1473,6 +1473,11 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
                         }),
                     })
                 }),
+                x.AuditRemark,
+                AuditTime= Common.ConvertHelper.FormatTime(x.AuditTime),
+                x.AuditUserId,
+                AccountName= UserReidsCache.GetUserLoginInfo((x.CreateBy > 0?x.CreateBy:0))?.AccountName??"",
+                UserIcon = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.UserIcon ?? "",
             });
         }
 
@@ -1863,6 +1868,11 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
                             }),
                         })
                     }),
+                    x.AuditRemark,
+                    AuditTime= Common.ConvertHelper.FormatTime(x.AuditTime),
+                    x.AuditUserId,
+                    AccountName = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.AccountName ?? "",
+                    UserIcon = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.UserIcon ?? "",
                 })
             };
         }
@@ -2988,6 +2998,11 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
                         }),
                     })
                 }),
+                x.AuditRemark,
+                AuditTime = Common.ConvertHelper.FormatTime(x.AuditTime),
+                x.AuditUserId,
+                AccountName = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.AccountName ?? "",
+                UserIcon = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.UserIcon ?? "",
             };
         }
 

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -1044,10 +1044,10 @@ namespace Edu.WebApi.Controllers.OKR
             var userInfo = base.UserInfo;
             JObject parms = JObject.Parse(RequestParm.Msg.ToString());
             int PeriodId = parms.GetInt("PeriodId", 0);
-            if (PeriodId <= 0)
-            {
-                return ApiResult.ParamIsNull();
-            }
+            //if (PeriodId <= 0)
+            //{
+            //    return ApiResult.ParamIsNull();
+            //}
 
             var obj = okrPeriodModule.GetOKRMyEmployeeAuditList(PeriodId, userInfo);
             return ApiResult.Success("", obj);