wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消除warning

Browse Source
This commit is contained in:
周科达
2023-07-07 15:54:43 +08:00
parent c112472256
commit 844b76b823
17 changed files with 81 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
BasicData/Tnb.BasicData/BasESopService.cs
View File

@@ -50,9 +50,9 @@ namespace Tnb.BasicData
{
var db = _repository.AsSugarClient();
Dictionary<string, object>? queryJson = string.IsNullOrEmpty(input.queryJson) ? null : input.queryJson.ToObject<Dictionary<string, object>>();
string code = queryJson!=null && queryJson.ContainsKey("code") ? queryJson["code"].ToString() : "";
string name = queryJson!=null && queryJson.ContainsKey("name") ? queryJson["name"].ToString() : "";
string version = queryJson!=null && queryJson.ContainsKey("version") ? queryJson["version"].ToString() : "";
string? code = queryJson!=null && queryJson.ContainsKey("code") ? queryJson["code"].ToString() : "";
string? name = queryJson!=null && queryJson.ContainsKey("name") ? queryJson["name"].ToString() : "";
string? version = queryJson!=null && queryJson.ContainsKey("version") ? queryJson["version"].ToString() : "";
var list = await db.Queryable<BasESop, BasMbom, BasMbomProcess, UserEntity,BasProcess>((a, b, c, d,e) => new object[]
{
JoinType.Left, a.mbom_id == b.id,
@@ -60,17 +60,17 @@ namespace Tnb.BasicData
JoinType.Left, a.create_id == d.Id,
JoinType.Left, c.process_id == e.id,
})
.WhereIF(!string.IsNullOrEmpty(code), (a, b, c, d) => a.code.Contains(code))
.WhereIF(!string.IsNullOrEmpty(name), (a, b, c, d) => a.name.Contains(name))
.WhereIF(!string.IsNullOrEmpty(version), (a, b, c, d) => a.version.Contains(version))
.WhereIF(!string.IsNullOrEmpty(code), (a, b, c, d) => a.code.Contains(code!))
.WhereIF(!string.IsNullOrEmpty(name), (a, b, c, d) => a.name.Contains(name!))
.WhereIF(!string.IsNullOrEmpty(version), (a, b, c, d) => a.version.Contains(version!))
.Where((a,b,c)=>a.enabled==1)
.Select((a, b, c, d,e) => new ESopListOutput
{
id = a.id,
code = a.code,
name = a.name,
mbom_id = b.version,
mbom_process_id = e.process_name,
mbom_id = b.version!,
mbom_process_id = e.process_name!,
version = a.version,
enabled = a.enabled==1 ? "是" : "否",
attachment = a.attachment,
@@ -106,14 +106,14 @@ namespace Tnb.BasicData
.WhereIF(!string.IsNullOrEmpty(code), (a, b, c, d) => a.code.Contains(code))
.WhereIF(!string.IsNullOrEmpty(name), (a, b, c, d) => a.name.Contains(name))
.WhereIF(!string.IsNullOrEmpty(version), (a, b, c, d) => a.version.Contains(version))
.Where((a,b,c)=>a.mbom_id==input.mbom_id && a.mbom_process_id==input.mbom_process_id)
.Where((a,b,c)=>a.mbom_id==input!.mbom_id && a.mbom_process_id==input!.mbom_process_id)
.Select((a, b, c, d,e) => new ESopListOutput
{
id = a.id,
code = a.code,
name = a.name,
mbom_id = b.version,
mbom_process_id = e.process_name,
mbom_id = b.version!,
mbom_process_id = e.process_name!,
version = a.version,
enabled = a.enabled==1 ? "是" : "否",
attachment = a.attachment,
@@ -135,7 +135,7 @@ namespace Tnb.BasicData
return await _repository.GetFirstAsync(x => x.mbom_process_id == mbomProcessId && x.enabled == 1);
}
return null;
return null!;
}
[HttpPost]