Merge branch 'test' into dev

hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

@@ -2,6 +2,7 @@ package com.fjhx.purchase.flow;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
@@ -110,7 +111,10 @@ public class PayFlow extends FlowDelegate {
         payment.setAccountManagementId(pay.getAccountManagementId());
         payment.setBusinessId(pay.getId());
         payment.setCurrency(pay.getCurrency());
+
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         SysUser sysUser = userService.getOne(IWrapper.<SysUser>getWrapper().eq(SysUser::getUserId, pay.getCreateUser()));
+        DynamicDataSourceContextHolder.poll();
         if (ObjectUtils.isNotEmpty(sysUser)) {
             payment.setDepartmentId(sysUser.getDeptId());
         }