Merge remote-tracking branch 'origin/master'

sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -1193,18 +1193,17 @@ public class OwnMessageController extends BaseController {
 
     /**
      * 查询企业当前融信已盖章合同
-     * @param zfrId 融信id
+     * @param zfiId 融信id
      * @return
      * @throws Exception
      */
     @GetMapping("/listStamped")
-    public AjaxResult listStamped (@RequestParam(required=false) String zfrId) throws Exception {
+    public AjaxResult listStamped (@RequestParam(required=false) String zfiId) throws Exception {
         //获取当前用户
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();
         //获取公司
         String companyId = use.getCompanyId();
-        System.out.println("zfrId========》"+zfrId);
         //企业类型
         String companyType = use.getCompanyType();
         LambdaQueryWrapper<ZcFinanceFileRel> queryWrapper = new LambdaQueryWrapper<>();
@@ -1215,9 +1214,9 @@ public class OwnMessageController extends BaseController {
             //供应商
             queryWrapper.eq(ZcFinanceFileRel::getZffrSupplierId,companyId);
         }
-        queryWrapper.eq(ZcFinanceFileRel::getZffrFinanceId, zfrId);
+        queryWrapper.eq(ZcFinanceFileRel::getZffrFinanceId, zfiId);
         List<ZcFinanceFileRel> financeFileList = financeFileRelService.findZcFinanceFileRels(queryWrapper);
-        ZcFinanceInf zcFinanceInf = financeInfService.getById(zfrId);
+        ZcFinanceInf zcFinanceInf = financeInfService.getById(zfiId);
         List<PubFileInf> fileInfList = new ArrayList<>();
         //返回
         Map<String,Object> p = new HashMap<>();