流程bug修改

sc-service/src/main/java/com/huyi/service/common/financeInf/controller/FinanceInfController.java

@@ -2,6 +2,7 @@ package com.huyi.service.common.financeInf.controller;
 
 import com.huyi.service.base.service.*;
 import com.huyi.service.common.financeInf.service.FinanceInfService;
+import com.tianhu.common.core.constant.SalaryConstants;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.*;
 import com.tianhu.common.core.web.controller.BaseController;
@@ -46,7 +47,9 @@ public class FinanceInfController extends BaseController {
         //获取企业
         String companyId = user.getCompanyId();
         Map map = new HashMap();
-        map.put("companyId",companyId);
+        if (!SalaryConstants.OPEX.equals(companyId)) {
+            map.put("companyId", companyId);
+        }
         map.put("zfiId",zfrFinanceId);
         List<Map> list = financeInfService.selectFinanceInfList(map);
         //申请融资用

sc-service/src/main/java/com/huyi/service/financeRecord/controller/FinanceRecordController.java

@@ -643,10 +643,14 @@ public class FinanceRecordController extends BaseController {
      */
     @GetMapping("listAccInf/{zfiProductId}")
     public AjaxResult listAccInf(@PathVariable("zfiProductId") String zfiProductId){
-        //查询融资产品编号
-        ZcFinanceProduct zcFinanceProduct = iZcFinanceProductService.getById(zfiProductId);
-        //资方id
-        String zfpManagementId = zcFinanceProduct.getZfpManagementId();
+//        //查询融资产品编号
+//        ZcFinanceProduct zcFinanceProduct = iZcFinanceProductService.getById(zfiProductId);
+//        //资方id
+//        String zfpManagementId = zcFinanceProduct.getZfpManagementId();
+        //查询当前操作员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser user = userInfo.getSysUser();
+        String companyId = user.getCompanyId();
         //通过资方id查询电子账户表
         LambdaQueryWrapper<PayAccInf> accInfWrapper = new LambdaQueryWrapper<>();
         //账户状态(0:未开通，1：冻结,2已开通3:待激活)
@@ -656,7 +660,7 @@ public class FinanceRecordController extends BaseController {
         //默认查询中信银行
         accInfWrapper.eq(PayAccInf::getPaiQlbankno,"302");
         //资方id
-        accInfWrapper.eq(PayAccInf::getPaiCstno,zfpManagementId);
+        accInfWrapper.eq(PayAccInf::getPaiCstno,companyId);
         List<PayAccInf> accInfList = iPayAccInfService.findPayAccInfs(accInfWrapper);
         String zfrCollectionAccount = "";
         if (accInfList.size() > 0){