diff --git a/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
index 5543715e..bf133ec7 100644
--- a/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
@@ -35,13 +35,14 @@ public class DevicePageResponse
///
/// 设备功能 DeviceFuncEnumType
///
- public List Funcs
+ public List Funcs
{
get
{
if (FuncsStr.IsEmpty()) FuncsStr = "[]";
- return FuncsStr.ToObject>();
+ var func = FuncsStr.ToObject>();
+ return func.Select(x => x.GetDescription()).ToList();
}
}
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 7c2928ae..dac5dba0 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -169,19 +169,22 @@ public class BalanceService : IBalanceService
balanceInfo.Status = BalanceRecordStatusEnumType.Obsolute;
balanceInfo.Remark += request.Reason;
-
- var newBalanceRecord = balanceInfo.Adapt();
- newBalanceRecord.Id = 0;
- newBalanceRecord.No = SnowFlakeHelper.Instance.NextId().ToString();
- newBalanceRecord.Amount = request.Amount;
- newBalanceRecord.Remark = balanceInfo.No + ":" + request.Reason;
- newBalanceRecord.Status = BalanceRecordStatusEnumType.Valid;
-
await _dbContext.Client.Ado.BeginTranAsync();
try
{
await _dbContext.UpdateAsync(balanceInfo);
- await _dbContext.InsertAsync(newBalanceRecord);
+
+ //不为空则插入记录
+ if (request.Amount != 0)
+ {
+ var newBalanceRecord = balanceInfo.Adapt();
+ newBalanceRecord.Id = 0;
+ newBalanceRecord.No = SnowFlakeHelper.Instance.NextId().ToString();
+ newBalanceRecord.Amount = request.Amount;
+ newBalanceRecord.Remark = balanceInfo.No + ":" + request.Reason;
+ newBalanceRecord.Status = BalanceRecordStatusEnumType.Valid;
+ await _dbContext.InsertAsync(newBalanceRecord);
+ }
await _dbContext.Client.Ado.CommitTranAsync();
}