Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -2437,6 +2437,21 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 }
             }
             if (query.isOtherPolicyState()) {
+                if (StringUtils.isNotBlank(query.getPolicySid()) && query.isOtherPolicyState()) {
+                    LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(query.getPolicySid());
+                    if (loanFinOtherPolicy != null) {
+                        solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
+                        solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
+                        solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
+                        solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
+                        solutionssVo.setOtherPolicyIsMain(true);
+                    }
+                } else {
+                    LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(query.getPolicySid());
+                    if (loanFinOtherPolicy != null) {
+                        solutionssVo.setOtherPolicyIsMain(true);
+                    }
+                }
                 //验证贷款金额是否不大于最高贷款金额
                 LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(query.getOtherPolicySid());
                 if (loanFinOtherPolicy != null) {