wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：null警告

Browse Source
This commit is contained in:
不做码农 2022-08-15 20:22:19 +08:00
parent 6ac5c4d6a0
commit ddc460c2a4
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/CommonController.cs
View File

@ -178,6 +178,6 @@ namespace ZR.Admin.WebApi.Controllers
/// 文件名生成类型 1 原文件名 2 自定义 3 自动生成 /// 文件名生成类型 1 原文件名 2 自定义 3 自动生成
/// </summary> /// </summary>
public int FileNameType { get; set; } public int FileNameType { get; set; }
public IFormFile File { get; set; } public IFormFile? File { get; set; }
} }
} }

2
ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
View File

@ -256,7 +256,7 @@ namespace ZR.Admin.WebApi.Controllers
[ActionPermissionFilter(Permission = "tool:gen:code")] [ActionPermissionFilter(Permission = "tool:gen:code")]
public IActionResult CodeGenerate([FromBody] GenerateDto dto) public IActionResult CodeGenerate([FromBody] GenerateDto dto)
{ {
if (dto?.TableId <= 0) if (dto == null || dto.TableId <= 0)
{ {
throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空"); throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空");
} }

2
ZR.Admin.WebApi/Controllers/System/TasksController.cs
View File

@ -70,7 +70,7 @@ namespace ZR.Admin.WebApi.Controllers
{ {
return SUCCESS(_tasksQzService.GetId(id)); return SUCCESS(_tasksQzService.GetId(id));
} }
return SUCCESS(null); return SUCCESS(0);
} }
/// <summary> /// <summary>

26
ZR.Admin.WebApi/Extensions/EntityExtension.cs
View File

@ -9,52 +9,52 @@ namespace ZR.Admin.WebApi.Extensions
public static TSource ToCreate<TSource>(this TSource source, HttpContext? context = null) public static TSource ToCreate<TSource>(this TSource source, HttpContext? context = null)
{ {
var types = source?.GetType(); var types = source?.GetType();
if (types == null) return source;
if (types.GetProperty("CreateTime") != null) if (types.GetProperty("CreateTime") != null)
{ {
types.GetProperty("CreateTime").SetValue(source, DateTime.Now, null); types.GetProperty("CreateTime")?.SetValue(source, DateTime.Now, null);
} }
if (types.GetProperty("AddTime") != null) if (types.GetProperty("AddTime") != null)
{ {
types.GetProperty("AddTime").SetValue(source, DateTime.Now, null); types.GetProperty("AddTime")?.SetValue(source, DateTime.Now, null);
} }
if (types.GetProperty("UpdateTime") != null) if (types.GetProperty("UpdateTime") != null)
{ {
types.GetProperty("UpdateTime").SetValue(source, DateTime.Now, null); types.GetProperty("UpdateTime")?.SetValue(source, DateTime.Now, null);
} }
if (types.GetProperty("Create_by") != null && context != null) if (types.GetProperty("Create_by") != null && context != null)
{ {
types.GetProperty("Create_by").SetValue(source, context.GetName(), null); types.GetProperty("Create_by")?.SetValue(source, context.GetName(), null);
} }
if (types.GetProperty("UserId") != null && context != null) if (types.GetProperty("UserId") != null && context != null)
{ {
types.GetProperty("UserId").SetValue(source, context.GetUId(), null); types.GetProperty("UserId")?.SetValue(source, context.GetUId(), null);
} }
return source; return source;
} }
public static TSource ToUpdate<TSource>(this TSource source, HttpContext context = null) public static TSource ToUpdate<TSource>(this TSource source, HttpContext? context = null)
{ {
var types = source.GetType(); var types = source?.GetType();
if (types == null) return source;
if (types.GetProperty("UpdateTime") != null) if (types.GetProperty("UpdateTime") != null)
{ {
types.GetProperty("UpdateTime").SetValue(source, DateTime.Now, null); types.GetProperty("UpdateTime")?.SetValue(source, DateTime.Now, null);
} }
if (types.GetProperty("Update_time") != null) if (types.GetProperty("Update_time") != null)
{ {
types.GetProperty("Update_time").SetValue(source, DateTime.Now, null); types.GetProperty("Update_time")?.SetValue(source, DateTime.Now, null);
} }
if (types.GetProperty("UpdateBy") != null) if (types.GetProperty("UpdateBy") != null)
{ {
types.GetProperty("UpdateBy").SetValue(source,context.GetName(), null); types.GetProperty("UpdateBy")?.SetValue(source, context?.GetName(), null);
} }
if (types.GetProperty("Update_by") != null) if (types.GetProperty("Update_by") != null)
{ {
types.GetProperty("Update_by").SetValue(source, context.GetName(), null); types.GetProperty("Update_by")?.SetValue(source, context?.GetName(), null);
} }
return source; return source;
} }