diff --git a/src/YhCore.Common/YhCore.Common.csproj b/src/YhCore.Common/YhCore.Common.csproj
index cad4382..3690b9d 100644
--- a/src/YhCore.Common/YhCore.Common.csproj
+++ b/src/YhCore.Common/YhCore.Common.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/src/YhCore.Model/Dto/DictionaryDtos.cs b/src/YhCore.Model/Dto/DictionaryDtos.cs
index 6c49041..afbdc6e 100644
--- a/src/YhCore.Model/Dto/DictionaryDtos.cs
+++ b/src/YhCore.Model/Dto/DictionaryDtos.cs
@@ -68,22 +68,10 @@ namespace YhCore.Model.Dto
/// 全部字典类别（typeID, typeName），对齐旧 EnumConfig.Dictionary 的 Description。
public static readonly (string Id, string Name)[] AllTypes =
{
- ("DEPT", "部门类别"),
- ("BXBM", "报修部门"),
("WYFL", "文印分类"),
("YZBM", "印制版面"),
("YZFL", "印制分类"),
- ("LeaveType", "请假类别"),
- ("FoodType", "物品类别"),
- ("Unit", "单位"),
- ("VenueType", "场馆类别"),
- ("Vefacilities", "场馆设施"),
- ("Time", "场馆时间"),
- ("Repeat", "场馆重复"),
- ("LevelOrder", "奖次"),
- ("filetype", "文件类型"),
- ("doclevel", "公文级别"),
- ("XKCategory", "选课类型"),
+ ("filetype", "文件类型")
};
/// GetSysDic 的 Type(int) → typeID；越界返回 null。
diff --git a/src/YhCore.Service/Impl/WYSHRoleService.cs b/src/YhCore.Service/Impl/WYSHRoleService.cs
index bd38a78..893974c 100644
--- a/src/YhCore.Service/Impl/WYSHRoleService.cs
+++ b/src/YhCore.Service/Impl/WYSHRoleService.cs
@@ -400,7 +400,7 @@ namespace YhCore.Service.Impl
#region 审核角色流程
- public async Task> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit)
+ public async Task> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit)
{
var resultList = (await _flowinfo.FindAsync(m => m.flowType == flowType && m.schSerID == schSerId)).ToList();
@@ -422,8 +422,8 @@ namespace YhCore.Service.Impl
if (!string.IsNullOrEmpty(name))
resultList = resultList.Where(m => m.flowname != null && m.flowname.IndexOf(name) >= 0).ToList();
- var ordered = resultList.OrderBy(m => m.SerID).ToList();
- var items = ordered.Skip(pageSize * pageIndex).Take(pageSize)
+ // 旧 ListFlow 的 Data 是纯数组（字段 SerID/flowname/deptid/typeid/enable/enablename/miaoshu/deitdate/ChaoSend/StepSend/WYPageGG 原样大小写），无总数包装
+ return resultList.OrderBy(m => m.SerID).Skip(pageSize * pageIndex).Take(pageSize)
.Select(item => new SHRoleFlowListItem
{
SerID = item.SerID.ToString(),
@@ -439,8 +439,6 @@ namespace YhCore.Service.Impl
WYPageGG = item.WYPageGG,
})
.ToList();
-
- return PageVO.Of(items, ordered.Count, pageIndex, pageSize);
}
public async Task EditFlowAsync(Common_flowinfo model)
diff --git a/src/YhCore.Service/Interfaces/IWYSHRoleService.cs b/src/YhCore.Service/Interfaces/IWYSHRoleService.cs
index a5815df..e5a5f94 100644
--- a/src/YhCore.Service/Interfaces/IWYSHRoleService.cs
+++ b/src/YhCore.Service/Interfaces/IWYSHRoleService.cs
@@ -31,7 +31,8 @@ namespace YhCore.Service.Interfaces
Task DelSHRoleAsync(string schSerId, List listSHRoleId);
// ---- 审核角色流程 ----
- Task> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit);
+ /// 旧 ListFlow 的 Data 为纯数组（非分页对象），此处保持裸 List 对齐旧 data 内容。
+ Task> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit);
Task EditFlowAsync(Common_flowinfo model);
Task StepCreateOfSHRoleAsync(Common_flowstep model);
Task GetStepInfoAsync(string schSerId, decimal flowid);
diff --git a/src/YhCore.Service/YhCore.Service.csproj b/src/YhCore.Service/YhCore.Service.csproj
index 005bdd3..45131d3 100644
--- a/src/YhCore.Service/YhCore.Service.csproj
+++ b/src/YhCore.Service/YhCore.Service.csproj
@@ -22,9 +22,9 @@
-
+
-
+
diff --git a/src/YhCore.WebApi/Controllers/Api/Common/CommonController.cs b/src/YhCore.WebApi/Controllers/Api/Common/CommonController.cs
index 282fb0c..d4621d0 100644
--- a/src/YhCore.WebApi/Controllers/Api/Common/CommonController.cs
+++ b/src/YhCore.WebApi/Controllers/Api/Common/CommonController.cs
@@ -8,6 +8,7 @@ using System.Linq;
using System.Threading.Tasks;
using Yh.Platform.Abstractions;
using Yh.SchClass.OpenApi;
+using Yh.SchClass.OpenApi.Model;
using YhCore.Common;
using YhCore.Common.Config;
using YhCore.Common.UserContext;
@@ -38,12 +39,11 @@ namespace YhCore.WebApi.Controllers.Api.Common
}
- /// 获取指定字典数据（Type 1~10）。
- //[HttpGet("GetSchoolAll")]
- //public async Task> GetSchoolAll([FromQuery] int type = 0)
- //{
- // return await _sch.S.GetSchTeaInfoAsync(SchSerID(), null);
- //}
+ [HttpGet("GetSchoolAll")]
+ public async Task> GetSchoolAll([FromQuery] int type = 0)
+ {
+ return await _sch.SchTree.GetTeaTreeAsync(SchSerID(), null);
+ }
diff --git a/src/YhCore.WebApi/Controllers/Api/DocPrint/WYSHRoleController.cs b/src/YhCore.WebApi/Controllers/Api/DocPrint/WYSHRoleController.cs
index 50dc88a..2c16d22 100644
--- a/src/YhCore.WebApi/Controllers/Api/DocPrint/WYSHRoleController.cs
+++ b/src/YhCore.WebApi/Controllers/Api/DocPrint/WYSHRoleController.cs
@@ -118,9 +118,9 @@ namespace YhCore.WebApi.Controllers.Api.DocPrint
#region 审核角色流程
- /// 审核流程列表（旧 ListFlow）。
+ /// 审核流程列表（旧 ListFlow；data 与旧 Data 一致为纯数组，字段大小写原样）。
[HttpGet("ListFlow")]
- public async Task> ListFlow(
+ public async Task> ListFlow(
[FromQuery] string name = null,
[FromQuery] int pageSize = 10,
[FromQuery] int pageIndex = 0,
diff --git a/src/YhCore.WebApi/YhCore.WebApi.csproj b/src/YhCore.WebApi/YhCore.WebApi.csproj
index 599b86f..3d170bb 100644
--- a/src/YhCore.WebApi/YhCore.WebApi.csproj
+++ b/src/YhCore.WebApi/YhCore.WebApi.csproj
@@ -36,11 +36,11 @@
-
-
-
-
-
+
+
+
+
+