优化贷后数据算法

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java

@@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 })
 @EnableScheduling
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.base", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.messagecenter", "com.yxt.anrui.fin"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.base", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.messagecenter", "com.yxt.anrui.fin","com.yxt.anrui.crm.fegin.as"})
 public class CrmApplication {
 
     public static void main(String[] args) {

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -203,5 +203,5 @@ public interface SysOrganizationFeign {
     @GetMapping("/selectByOrgCodeAndPsid")
     @ResponseBody
     @ApiOperation("根据code查询组织信息")
-    ResultBean<SysOrganization> selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid);
+    ResultBean<List<SysOrganization>> selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -203,7 +203,7 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     }
 
     @Override
-    public ResultBean<SysOrganization> selectByOrgCodeAndPsid(String orgCode, String pSid) {
+    public ResultBean<List<SysOrganization>> selectByOrgCodeAndPsid(String orgCode, String pSid) {
         return null;
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -129,5 +129,5 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
 
     List<SysOrgStaffVo> selectByOrgDeptSid2(String orgDeptSid);
 
-    SysOrganization selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid);
+    List<SysOrganization> selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -468,9 +468,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     }
 
     @Override
-    public ResultBean<SysOrganization> selectByOrgCodeAndPsid(String orgCode, String pSid) {
+    public ResultBean<List<SysOrganization>> selectByOrgCodeAndPsid(String orgCode, String pSid) {
         ResultBean rb = ResultBean.fireFail();
-        SysOrganization sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid);
+        List<SysOrganization> sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid);
         return rb.success().setData(sysOrganization);
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -716,7 +716,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return rb.success().setData(sysOrganizationListVos);
     }
 
-    public SysOrganization selectByOrgCodeAndPsid(String orgCode, String pSid) {
+    public List<SysOrganization> selectByOrgCodeAndPsid(String orgCode, String pSid) {
         return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid);
     }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -5038,7 +5038,11 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 useOrgSid = orgCompany.getSid();
                 useOrgName = orgCompany.getName();
             }
-            SysOrganization orgDept = sysOrganizationFeign.selectByOrgCodeAndPsid(salesDeptNo, useOrgSid).getData();
+            List<SysOrganization> orgDepts = sysOrganizationFeign.selectByOrgCodeAndPsid(salesDeptNo, useOrgSid).getData();
+            SysOrganization orgDept = null;
+            if (!orgDepts.isEmpty() && orgDepts.size() > 0) {
+                orgDept = orgDepts.get(0);
+            }
             if (orgDept != null) {
                 deptSid = orgDept.getSid();
                 deptName = orgDept.getName();