Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java

@@ -57,5 +57,5 @@ public interface LoanFinPolicyFeign {
 
     @ApiOperation("已备案的产品政策（分公司，有效期内）")
     @GetMapping("selectList")
-    ResultBean<List<PolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
+    ResultBean<List<PolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid,@RequestParam("isPack") String isPack);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java

@@ -27,5 +27,5 @@ public interface LoanFinPolicyMapper extends BaseMapper<LoanFinPolicy> {
 
     AppPolicyDetailsVo getProductInfo(String sid);
 
-    List<PolicyVo> selectListOne(String useOrgSid);
+    List<PolicyVo> selectListOne(@Param("useOrgSid") String useOrgSid,@Param("isPack") String isPack);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml

@@ -91,6 +91,7 @@
         select lfp.policyName, lfp.sid
         from loan_fin_policy lfp
         where lfp.filingState = 2
+        and isPack = #{isPack}
           and lfp.useOrgSid = #{useOrgSid}
           and lfp.validDateTo > now()
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java

@@ -69,7 +69,7 @@ public class LoanFinPolicyRest implements LoanFinPolicyFeign {
     }
 
     @Override
-    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid) {
-        return loanFinPolicyService.selectList(orgPath,userSid);
+    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid,String isPack) {
+        return loanFinPolicyService.selectList(orgPath,userSid,isPack);
     }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -490,10 +490,10 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         return rb.success().setData(appPolicyDetailsVo);
     }
 
-    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid) {
+    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid,String isPack) {
         ResultBean<List<PolicyVo>> rb = ResultBean.fireFail();
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-        List<PolicyVo> list = baseMapper.selectListOne(useOrgSid);
+        List<PolicyVo> list = baseMapper.selectListOne(useOrgSid,isPack);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }