diff --git a/PEIS/Model/Setting/FeeItemModel.cs b/PEIS/Model/Setting/FeeItemModel.cs index 4ff8191..e09e642 100644 --- a/PEIS/Model/Setting/FeeItemModel.cs +++ b/PEIS/Model/Setting/FeeItemModel.cs @@ -39,9 +39,9 @@ namespace PEIS.Model public List GetItemsByPack(Int64 id) // 从套餐获取收费项目 { - var list = DAOHelp.GetDataBySQL($"Select * From vi_PackFeeItem"); - return list.Where(p => p.PID == id).OrderBy(o => o.ItemClass).ThenBy(t=>t.UnitName).ThenBy(t1=>t1.DeptCode).ThenBy(t3=>t3.FeeItemCode).ToList(); - } + var list = DAOHelp.GetDataBySQL($"Select * From vi_PackFeeItem where PID={id} order by DeptCode, ItemClass, FeeItemCode"); + return list; + } /// /// 是否可以删除收费项目(未添加到套餐) /// @@ -53,7 +53,7 @@ namespace PEIS.Model SELECT TOP 1 B.* FROM [dbo].[Dict_PackToFeeItem] A LEFT JOIN Dict_Pack B ON A.PID = B.ID WHERE A.FID = {fid} AND B.Name <> ''")?.FirstOrDefault(); - return pack?.Name; + return pack?.Name; } public List GetSigns(Int64 rid) { diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj index f48ef9c..ea3b18c 100644 --- a/PEIS/PEIS.csproj +++ b/PEIS/PEIS.csproj @@ -850,12 +850,6 @@ - - Always - - - PreserveNewest - PreserveNewest @@ -922,9 +916,7 @@ - - - + False diff --git a/PEIS/Update/Update.exe b/PEIS/Update/Update.exe deleted file mode 100644 index 5120906..0000000 Binary files a/PEIS/Update/Update.exe and /dev/null differ diff --git a/PEIS/Update/update.png b/PEIS/Update/update.png deleted file mode 100644 index 96948ce..0000000 Binary files a/PEIS/Update/update.png and /dev/null differ