Merge remote-tracking branch 'origin/master'

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

@@ -709,6 +709,11 @@ public class RecordSealController extends BaseController {
         return AjaxResult.success();
     }
 
+    /**
+     * 查询费用状态
+     * @param zfrId 融资id
+     * @return
+     */
     @GetMapping("/listChargeStatus/{zfrId}")
     public AjaxResult listChargeStatus(@PathVariable("zfrId") String zfrId){
         //融资信息

sc-service/src/main/resources/mapper/creditLine/CreditLineMapper.xml

@@ -95,6 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ON s.scy_id = p.zfp_management_id
         WHERE 1=1
         and zfsq_status != '99'
+        <if test="paramMap.companyType == 02">
+            and q.zfsq_company_id =  #{paramMap.companyId}
+        </if>
         <if test="paramMap.rzScyName != null  and paramMap.rzScyName != ''">
             and s.scy_name like concat('%', #{paramMap.rzScyName}, '%')
         </if>