Merge remote-tracking branch 'origin/master'

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -55,7 +55,7 @@ public enum ProcDefEnum {
     DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:6:4827504"),
     LOANTEMPLATEAPPLY("定制金融方案", "process_9q5omebi:2:2685008"),
     LOANHOMEVISITAPPEALAPPLY("家访考察申诉", "process_8ujil3h3:1:3665004"),
-    BUSVALCUSTFILING("价值客户备案申请", "process_n8fwpitk:1:4825004"),
+    BUSVALCUSTFILING("价值客户备案申请", "process_n8fwpitk:2:5085004"),
 
     /******************************测试流程id*********************************************/
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java

@@ -70,7 +70,7 @@ public class LoanHomevisitPrepQuery implements Query {
     @ApiModelProperty("金融产品名称")
     private String policyName;
 	@ApiModelProperty("组织全路径")
-    private String orgSidPath;
+    private String orgPath;
     private String menuUrl;
     private String type;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -99,13 +99,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         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);