|
@@ -548,7 +548,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
var datas = await _sqlSugar
|
|
|
.Queryable<Sys_SetData>()
|
|
|
.Where(x => x.IsDel == 0 && (x.STid == 72 || x.STid == 73))
|
|
|
-
|
|
|
.ToListAsync();
|
|
|
|
|
|
|
|
@@ -560,6 +559,21 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
Remark = x.Remark
|
|
|
|
|
|
}).ToArray();
|
|
|
+ if (wordTypeData.Length < 1)
|
|
|
+ {
|
|
|
+ //ProvinceDefaultItem
|
|
|
+
|
|
|
+ var defaultItem = datas.Where(x => x.STid == 72 && x.Remark.Contains("ProvinceDefaultItem"))
|
|
|
+ .Select(x => new SetDataInfoView()
|
|
|
+ {
|
|
|
+ Id = x.Id,
|
|
|
+ Name = x.Name,
|
|
|
+ Remark = x.Remark
|
|
|
+
|
|
|
+ }).FirstOrDefault();
|
|
|
+ wordTypeData = new SetDataInfoView[] { defaultItem };
|
|
|
+ }
|
|
|
+
|
|
|
var excelTypeData = datas.Where(x => x.STid == 73 && x.Remark.Contains(provinceId.ToString()))
|
|
|
.Select(x => new SetDataInfoView()
|
|
|
{
|