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

回退

Browse Source
This commit is contained in:
周科达
2023-04-26 16:32:15 +08:00
parent a2eb375553
commit c155218229
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apihost/Tnb.API.Entry/Configurations/Cors.json
View File

@@ -1,7 +1,7 @@
{ {
"CorsAccessorSettings": { "CorsAccessorSettings": {
"PolicyName": "JNPFCorsAccessor", "PolicyName": "JNPFCorsAccessor",
"WithOrigins": [ "http://192.168.10.12:9230", "http://192.168.10.18:9230","http://localhost:8080","http://localhost:9230" ], "WithOrigins": [ "http://192.168.10.12:9230", "http://localhost:8080" ],
"WithExposedHeaders": [ "access-token", "x-access-token", "Content-Disposition" ] "WithExposedHeaders": [ "access-token", "x-access-token", "Content-Disposition" ]
} }
} }

2
system/Tnb.Systems/System/PrintDevService.cs
View File

@@ -92,7 +92,7 @@ public class PrintDevService : IDynamicApiController, ITransient
{ {
var list = await _repository.AsSugarClient().Queryable<PrintDevEntity, UserEntity, UserEntity, DictionaryDataEntity>((a, b, c, d) => var list = await _repository.AsSugarClient().Queryable<PrintDevEntity, UserEntity, UserEntity, DictionaryDataEntity>((a, b, c, d) =>
new JoinQueryInfos(JoinType.Left, b.Id == a.CreatorUserId, JoinType.Left, c.Id == a.LastModifyUserId, JoinType.Left, a.Category == d.EnCode)) new JoinQueryInfos(JoinType.Left, b.Id == a.CreatorUserId, JoinType.Left, c.Id == a.LastModifyUserId, JoinType.Left, a.Category == d.EnCode))
.Where((a, b, c, d) => a.DeleteMark == null ).WhereIF(input.category.IsNotEmptyOrNull(), a => a.Category == input.category) .Where((a, b, c, d) => a.DeleteMark == null && d.DictionaryTypeId == "202931027482510597").WhereIF(input.category.IsNotEmptyOrNull(), a => a.Category == input.category)
.WhereIF(input.keyword.IsNotEmptyOrNull(), a => a.FullName.Contains(input.keyword) || a.EnCode.Contains(input.keyword)) .WhereIF(input.keyword.IsNotEmptyOrNull(), a => a.FullName.Contains(input.keyword) || a.EnCode.Contains(input.keyword))
.OrderBy(a => a.SortCode).OrderBy(a => a.CreatorTime, OrderByType.Desc) .OrderBy(a => a.SortCode).OrderBy(a => a.CreatorTime, OrderByType.Desc)
.Select((a, b, c, d) => new PrintDevListOutput .Select((a, b, c, d) => new PrintDevListOutput