Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java

@@ -33,4 +33,6 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper<LoanFinOtherPolicy>
     List<OtherPolicyVo> selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
 
     IPage<LoanFinOtherPolicyPageVo> selectPageVo(IPage<LoanFinOtherPolicy> page,@Param(Constants.WRAPPER)QueryWrapper<LoanPreloanCreditApply> qw);
+
+    List<LoanFinOtherPolicy> fetchByMainSid(String mainSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml

@@ -84,4 +84,11 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="fetchByMainSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy">
+        select *
+        from loan_fin_otherpolicy
+        where mainPolicySid = #{mainPolicySid}
+          and isDelete = '0'
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -331,4 +331,8 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         }
         return rb.success();
     }
+
+    public List<LoanFinOtherPolicy> fetchByMainSid(String mainSid) {
+        return baseMapper.fetchByMainSid(mainSid);
+    }
 }

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

@@ -630,7 +630,7 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
             if (StringUtils.isNotBlank(query.getOrgPath())) {
                 String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
                 qw.eq("lfp.useOrgSid", useOrgSid);
-                String deptSid = Arrays.asList(query.getOrgPath().split("/")).get(Arrays.asList(query.getOrgPath().split("/")).size());
+                String deptSid = Arrays.asList(query.getOrgPath().split("/")).get(Arrays.asList(query.getOrgPath().split("/")).size()-1);
                 qw.like("lfp.useDeptSids", deptSid);
             }
             qw.eq("lfp.filingState", 1);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java

@@ -237,7 +237,8 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
             LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(psid);
             BeanUtil.copyProperties(loanFinPolicy, initVo);
             initVo.setPolicySid(psid);
-            List<LoanFinOtherPolicy> otherPolicy = loanFinOtherPolicyService.getOtherPolicyByMainSid(psid);
+           // List<LoanFinOtherPolicy> otherPolicy = loanFinOtherPolicyService.getOtherPolicyByMainSid(psid);
+            List<LoanFinOtherPolicy> otherPolicy = loanFinOtherPolicyService.fetchByMainSid(psid);
             otherPolicy.removeAll(Collections.singleton(null));
             initVo.setShowOtherPolicy(!otherPolicy.isEmpty());
             for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicy) {