From a14d7d575d3b0076f5c9b16c14163204a70f222f Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 26 Jul 2024 10:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=B7=E5=90=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yxt/anrui/crm/CrmApplication.java | 2 +- .../portal/api/sysorganization/SysOrganizationFeign.java | 2 +- .../api/sysorganization/SysOrganizationFeignFallback.java | 2 +- .../portal/biz/sysorganization/SysOrganizationMapper.java | 2 +- .../portal/biz/sysorganization/SysOrganizationRest.java | 4 ++-- .../portal/biz/sysorganization/SysOrganizationService.java | 2 +- .../loanrepaymentschedule/LoanRepaymentScheduleService.java | 6 +++++- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java index acb993ad2d..6de6af8bb5 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java +++ b/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) { diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index d053f64966..18fda29e5a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/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 selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid); + ResultBean> selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index fa3d1c82f9..86da604ebc 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/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 selectByOrgCodeAndPsid(String orgCode, String pSid) { + public ResultBean> selectByOrgCodeAndPsid(String orgCode, String pSid) { return null; } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 1b95a4f072..b869be61a3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/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 { List selectByOrgDeptSid2(String orgDeptSid); - SysOrganization selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid); + List selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 7156bae3d0..8713261da6 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/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 selectByOrgCodeAndPsid(String orgCode, String pSid) { + public ResultBean> selectByOrgCodeAndPsid(String orgCode, String pSid) { ResultBean rb = ResultBean.fireFail(); - SysOrganization sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid); + List sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid); return rb.success().setData(sysOrganization); } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index ebc7cb0946..4776975b27 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/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 selectByOrgCodeAndPsid(String orgCode, String pSid) { return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 1f39d29e4e..6036252375 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/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 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();