往来单位服务项目bug修复

ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs

@@ -93,7 +93,7 @@ namespace DS.WMS.Core.Fee.Method
         }
 
         //创建各项费用数据的查询并集
-        internal ISugarQueryable<FeeAuditBusiness> CreateQuery(params long[]? bsIds)
+        internal ISugarQueryable<FeeAuditBusiness> CreateQuery(params long[]? feeIds)
         {
             //海运出口
             var query1 = TenantDb.Queryable<SeaExport, BusinessFeeStatus, FeeRecord, CodeSource, CodeSourceDetail>((s, b, f, cs, csd) => new JoinQueryInfos(
@@ -102,7 +102,7 @@ namespace DS.WMS.Core.Fee.Method
                 JoinType.Left, s.SourceId == cs.Id,
                 JoinType.Left, s.SourceDetailId == csd.Id
                 ))
-                .WhereIF(bsIds != null && bsIds.Length > 0, (s, b, f) => bsIds.Contains(f.Id))
+                .WhereIF(feeIds != null && feeIds.Length > 0, (s, b, f) => feeIds.Contains(f.Id))
                 .GroupBy(s => s.Id)
                 .Select((s, b, f, cs, csd) => new FeeAuditBusiness
                 {
@@ -229,7 +229,7 @@ namespace DS.WMS.Core.Fee.Method
         }
 
         //创建各项业务数据的查询并集
-        internal ISugarQueryable<FeeAuditBusiness> CreateBizQuery(params long[]? bsIds)
+        internal ISugarQueryable<FeeAuditBusiness> CreateBizQuery(params long[]? feeIds)
         {
             //海运出口
             var query1 = TenantDb.Queryable<SeaExport, BusinessFeeStatus, FeeRecord, CodeSource, CodeSourceDetail>((s, b, f, cs, csd) => new JoinQueryInfos(
@@ -238,7 +238,7 @@ namespace DS.WMS.Core.Fee.Method
                 JoinType.Left, s.SourceId == cs.Id,
                 JoinType.Left, s.SourceDetailId == csd.Id
                 ))
-                .WhereIF(bsIds != null && bsIds.Length > 0, (s, b) => bsIds.Contains(s.Id))
+                .WhereIF(feeIds != null && feeIds.Length > 0, (s, b, f, cs, csd) => feeIds.Contains(f.Id))
                 .GroupBy(s => s.Id)
                 .Select((s, b, f, cs, csd) => new FeeAuditBusiness
                 {

ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs

@@ -285,6 +285,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService
         data.Status = (int)StatusEnum.Disable;
         data.AuditStatus = AuditStatusEnum.NoAudit;
         data.OrgId = User.OrgId;
+
         if (req.ServiceItemCodes?.Length > 0)
             data.ServiceItem = string.Join(",", req.ServiceItemCodes);
 
@@ -322,11 +323,12 @@ public class ClientInfoService : ServiceBase, IClientInfoService
             data.CodeName = PinYinUtil.GetFristLetter(data.ShortName);
             tag = req.ClientTag.Adapt(tag);
 
+            data.ServiceItem = data.ServiceItem ?? string.Empty;
             TenantDb.Updateable(data).RemoveDataCache($"{SqlSugarCacheConst.InfoClient}{User.TenantId}")
                 .IgnoreColumns(ignoreAllNullColumns: true)
                 .IgnoreColumns(x => new { x.Status, x.AuditStatus })
-                .EnableDiffLogEvent().ExecuteCommand();
-            TenantDb.Updateable(tag).IgnoreColumns(ignoreAllNullColumns: true).EnableDiffLogEvent().ExecuteCommand();
+                .ExecuteCommand();
+            TenantDb.Updateable(tag).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
 
             return DataResult.Successed("更新成功!", MultiLanguageConst.DataUpdateSuccess);
         }