Merge remote-tracking branch 'origin/main'

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java

@@ -170,6 +170,7 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
         // 2、 无则直接新增项目 有则直接增加库存数量
         Long flag;
         if (select == null) {
+
             baseMapper.insert(add);
             flag = add.getId();
         } else  {
@@ -178,6 +179,7 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
                 select.setPrice((select.getPrice() * select.getInventory() + bo.getPrice() * bo.getInventory()) / (select.getInventory() + bo.getInventory()));
             }
 
+            baseMapper.updateById(select);
             flag = select.getId();
         }