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 c3780f0abc..2e97d551d7 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 @@ -224,4 +224,10 @@ public interface SysOrganizationFeign { @ResponseBody @ApiOperation("根据code查询组织信息") ResultBean> selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid); + + @GetMapping("/selectStaffListByUseOrgSid") + @ResponseBody + @ApiOperation("当前分公司销售专员") + ResultBean> selectStaffListByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid); + } 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 868e937c92..c05fdcbe34 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 @@ -231,4 +231,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean> selectByOrgCodeAndPsid(String orgCode, String pSid) { return null; } + + @Override + public ResultBean> selectStaffListByUseOrgSid(String useOrgSid) { + 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 191e6ec58c..5c7eff9a67 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 @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.portal.api.sysorganization.*; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; -import com.yxt.anrui.terminal.api.base.common.FinanceVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -140,4 +139,6 @@ public interface SysOrganizationMapper extends BaseMapper { List tranfour(String sid); List tranFive(String sid); + + List selectStaffListByUseOrgSid(@Param("orgSidPath") String orgSidPath); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 124240d37c..b4fcc7872e 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -315,4 +315,15 @@ WHERE orgAttributeKey = 'fwz_003' AND psid = #{sid} + 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 5e8a7bb886..36d243e1db 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 @@ -498,4 +498,11 @@ public class SysOrganizationRest implements SysOrganizationFeign { List sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid); return rb.success().setData(sysOrganization); } + + @Override + public ResultBean> selectStaffListByUseOrgSid(String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List voList = sysOrganizationService.selectStaffListByUseOrgSid(useOrgSid); + return rb.success().setData(voList); + } } 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 e2d45b4ee7..ae65807340 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 @@ -739,4 +739,14 @@ public class SysOrganizationService extends MybatisBaseService tranFive(String sid) { return baseMapper.tranFive(sid); } + + public List selectStaffListByUseOrgSid(String useOrgSid) { + SysOrganization sysOrganization = fetchById(useOrgSid); + if (null != sysOrganization) { + String orgSidPath = sysOrganization.getOrgSidPath(); + List list = baseMapper.selectStaffListByUseOrgSid(orgSidPath); + return list; + } + return new ArrayList<>(); + } }