diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java index 653fa6ea8b..cfaf69335d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java +++ b/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> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid); + ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid,@RequestParam("isPack") String isPack); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java index c35cf7256b..c3df7cd9a5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java +++ b/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 { AppPolicyDetailsVo getProductInfo(String sid); - List selectListOne(String useOrgSid); + List selectListOne(@Param("useOrgSid") String useOrgSid,@Param("isPack") String isPack); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index 248e986460..10822f6514 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/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() diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java index 14e97c4e78..0d37c150bf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java +++ b/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> selectList(String orgPath, String userSid) { - return loanFinPolicyService.selectList(orgPath,userSid); + public ResultBean> selectList(String orgPath, String userSid,String isPack) { + return loanFinPolicyService.selectList(orgPath,userSid,isPack); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index 2f61204b76..9219a96887 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/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> selectList(String orgPath, String userSid) { + public ResultBean> selectList(String orgPath, String userSid,String isPack) { ResultBean> rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - List list = baseMapper.selectListOne(useOrgSid); + List list = baseMapper.selectListOne(useOrgSid,isPack); list.removeAll(Collections.singleton(null)); return rb.success().setData(list); }