代码修正

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
@@ -20,6 +21,7 @@ import com.fjhx.item.util.CodeEnum;
 import com.fjhx.item.util.excel.util.ExcelUtil;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.service.ISysDeptService;
@@ -109,7 +111,9 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
 
         IWrapper<SysDept> wrapper1 = IWrapper.getWrapper();
         wrapper1.in(SysDept::getDeptId, ids);
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         List<SysDept> sysDepts = sysDeptService.list(wrapper1);
+        DynamicDataSourceContextHolder.poll();
         Map<Long, String> sysDeptMap = sysDepts.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
 
         for (ProductInfoVo record : records) {
@@ -143,6 +147,11 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         this.nameDuplication(ProductInfo::getName, productInfoDto.getName(), "产品名称重复");
         this.save(productInfoDto);
         ObsFileUtil.saveFile(productInfoDto.getFileList(), productInfoDto.getId());
+        //处理维多利亚扩展
+        String victoriatouristJson = productInfoDto.getVictoriatouristJson();
+        JSONObject json = JSONObject.parseObject(victoriatouristJson);
+        json.put("deptId", SecurityUtils.getDeptId());
+        productInfoDto.setVictoriatouristJson(json.toJSONString());
     }
 
     @Transactional(rollbackFor = Exception.class)

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -14,7 +14,8 @@
                pi.create_user,
                pi.create_time,
                pi.update_user,
-               pi.update_time
+               pi.update_time,
+               pi.victoriatourist_json
         from product_info pi
             ${ew.customSqlSegment}
     </select>

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -65,6 +65,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 item.setProductName(productInfo.getName());
             });
         }
+        //维多利亚扩展
+
 
         return page;
     }