Преглед изворни кода

Merge remote-tracking branch 'origin/dev1.0' into dev1.0

liutao пре 6 месеци
родитељ
комит
626fe3da65

+ 4 - 2
src/main/java/com/sunxung/factoring/service/settlement/impl/SettlementManagementServiceImpl.java

@@ -1163,6 +1163,8 @@ public class SettlementManagementServiceImpl implements SettlementManagementServ
 
     private void startProcess(SettlementBasicInfo settlementBasicInfo) {
         Long odlId = settlementBasicInfo.getId();
+        User user = userService.getByLoginName("admin");
+        ThreadLocalUtil.setUser(user);
         //2.新增处理人-- C端用户
         SupplierInfo supplierInfo = iSupplierInfoService.get(settlementBasicInfo.getSupplierId());
         //审核处理人
@@ -1182,8 +1184,8 @@ public class SettlementManagementServiceImpl implements SettlementManagementServ
 
         //3.开启流程实例
         Map<String, Object> procVariables = new HashMap<>();
-        procVariables.put(ConstantUtil.BILL_ASSIGNEE,supplierInfo.getSysUserId());
-        procVariables.put(ConstantUtil.BILL_SIGN_ASSIGNEE,supplierInfo.getSysUserId());
+        procVariables.put(ConstantUtil.BILL_ASSIGNEE,user.getId());
+        procVariables.put(ConstantUtil.BILL_SIGN_ASSIGNEE,user.getId());
         Map<String, Object> msgVariables = new HashMap<>();
         //查询条件:结算单编号/业务编号/核心企业名称/业务名称/供应商名称
         Enterprise enterprise = iEnterpriseService.getById(supplierInfo.getcEnterpriseId());