+1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -652,18 +652,21 @@ namespace OASystem.API.Controllers
                                                  .WhereIF(visitDt != null, x=> x.CreateTime == visitDt)
                                                  .FirstAsync();
 
-                    ffrInfo.Diid = diId;
-                    ffrInfo.PriceName = dto.ClientUnit;
-                    ffrInfo.Price = dto.PaymentMoney;
-                    ffrInfo.Count = 1;
-                    ffrInfo.Unit = $"元";
-                    ffrInfo.ItemSumPrice = dto.PaymentMoney;
-                    ffrInfo.Rate = 1.0000M;
-                    ffrInfo.Currency = 836;
-                    ffrInfo.AddingWay = 0;
-                    ffrInfo.CreateUserId = dto.UserId;
-                    ffrInfo.CreateTime = Convert.ToDateTime(dto.VisitDate).AddDays(-dto.PayDay);
-                    ffrInfo.Remark = $"预付款";
+                    ffrInfo = new Fin_ForeignReceivables()
+                    {
+                        Diid = diId,
+                        PriceName = dto.ClientUnit,
+                        Price = dto.PaymentMoney,
+                        Count = 1,
+                        Unit = $"元",
+                        ItemSumPrice = dto.PaymentMoney,
+                        Rate = 1.0000M,
+                        Currency = 836,
+                        AddingWay = 0,
+                        CreateUserId = dto.UserId,
+                        CreateTime = Convert.ToDateTime(dto.VisitDate).AddDays(-dto.PayDay),
+                        Remark = $"预付款"
+                    };
 
                     if (ffrInfo == null) //Add
                     {
@@ -671,7 +674,7 @@ namespace OASystem.API.Controllers
                     }
                     else //修改
                     {
-                        await _sqlSugar.Updateable<Fin_ForeignReceivables>(ffrInfo)
+                        await _sqlSugar.Updateable(ffrInfo)
                                        .UpdateColumns(x => new
                                        {
                                            x.PriceName,

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1841,6 +1841,9 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GoodsOP(GoodsOPDTO _dto)
         {
+            var _currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
+            if (_currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
+
             var validator = new GoodsOPDTOValidator();
             var validatorRes = await validator.ValidateAsync(_dto);
             if (!validatorRes.IsValid)
@@ -1850,7 +1853,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, sb.ToString()));
             }
 
-            return Ok(await _goodsRep.GoodsOP(_dto));
+            return Ok(await _goodsRep.GoodsOP(_dto, _currUserInfo.UserId));
         }
 
         /// <summary>

OASystem/OASystem.Api/Program.cs

@@ -74,11 +74,11 @@ builder.Services.AddCors(policy =>
     //.WithExposedHeaders("X-Pagination"));
 
     policy.AddPolicy("Cors", opt => opt
-          .SetIsOriginAllowed(origin => true)//这个必须加
+          .SetIsOriginAllowed(origin => true)
                                              //.AllowAnyOrigin()
           .AllowAnyHeader()
           .WithMethods("GET", "POST", "HEAD", "PUT", "DELETE", "OPTIONS")
-          .AllowCredentials());//这个一定不能少);
+          .AllowCredentials());
 
 });
 #endregion

OASystem/OASystem.Domain/Dtos/PersonnelModule/GoodsDTO.cs

@@ -36,11 +36,6 @@ namespace OASystem.Domain.Dtos.PersonnelModule
     /// </summary>
     public class GoodsOPDTO
     {
-        /// <summary>
-        /// 当前用户id
-        /// </summary>
-        public int CurrUserId { get; set; }
-
         /// <summary>
         /// ID编号
         /// ID > 0 Edit
@@ -75,7 +70,7 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public GoodsOPDTOValidator()
         {
-            RuleFor(x => x.CurrUserId).Must(x => x > 0).WithMessage("请传入当前登陆用户ID!");
+            //RuleFor(x => x.CurrUserId).Must(x => x > 0).WithMessage("请传入当前登陆用户ID!");
             RuleFor(x => x.Name).NotEmpty().WithMessage("物品名称为空!");
             RuleFor(x => x.Type).Must(x => x > 0).WithMessage("物品所属类型未选择!");
         }

OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/GoodsRepository.cs

@@ -157,8 +157,9 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
         /// 物品 OP(Create Or Edit)
         /// </summary>
         /// <param name="_dto"></param>
+        /// <param name="currUserId"></param>
         /// <returns></returns>
-        public async Task<JsonView> GoodsOP(GoodsOPDTO _dto)
+        public async Task<JsonView> GoodsOP(GoodsOPDTO _dto,int currUserId)
         {
             var info = new Pm_GoodsInfo()
             {
@@ -170,9 +171,9 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 PriceTotal = 0,
                 StockQuantity = 0,
                 Remark = _dto.Remark,
-                LastUpdateUserId = _dto.CurrUserId,
+                LastUpdateUserId = currUserId,
                 LastUpdateTime = DateTime.Now,
-                CreateUserId = _dto.CurrUserId
+                CreateUserId = currUserId
             };
 
             if (_dto.Id > 0) //Edit