Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineQuery.java

@@ -77,6 +77,7 @@ public class LoanHomevisitFileexamineQuery implements Query {
     private String homeVisStaffName;
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
+    private String orgPath;
     private String menuUrl;
     private String type;
     private String names;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -110,13 +110,13 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         if (StringUtils.isNotBlank(query.getMenuUrl())) {
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-            privilegeQuery.setOrgPath(query.getOrgSidPath());
+            privilegeQuery.setOrgPath(query.getOrgPath());
             privilegeQuery.setMenuUrl(query.getMenuUrl());
             privilegeQuery.setUserSid(query.getUserSid());
             ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
             if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
                 //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-                String orgSidPath = query.getOrgSidPath();
+                String orgSidPath = query.getOrgPath();
                 orgSidPath = orgSidPath + "/";
                 int i1 = orgSidPath.indexOf("/");
                 int i2 = orgSidPath.indexOf("/", i1 + 1);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

@@ -50,6 +50,7 @@ import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.AppFinOtherPolicyA
 import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.flow.CompleteOtherPolicyDto;
 import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.flow.OtherPolicyFlowableQuery;
 import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.flow.OtherPolicyTaskQuery;
+import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -93,11 +94,15 @@ public class CreditReviewService {
     private LoanSolutionsFeign loanSolutionsFeign;
     @Autowired
     private LoanFinPolicyFeign loanFinPolicyFeign;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
 
     public ResultBean<CreditReviewDetailsVo> initCreditReviewInfo(CreditReviewDetailsQuery query) {
         ResultBean rb = ResultBean.fireFail();
         CreditReviewDetailsVo creditReviewDetailsVo = new CreditReviewDetailsVo();
         if (StringUtils.isBlank(query.getSid())) {//新增初始化
+            String prefixTemplateUrl = docPdfComponent.getPrefixTemplateUrl();
+            creditReviewDetailsVo.setDownUrl(prefixTemplateUrl + "信息查询授权书.pdf");
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
             SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
             creditReviewDetailsVo.setUserSid(query.getUserSid());