diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java index 6ffa8cc43a..1d8e45025d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java @@ -90,4 +90,7 @@ public class FinUncollectedReceivablesDetailedQuery implements Query { private String noMoneyStart; //未还金额开始 private String noMoneyEnd; //未还金额结束 + + @ApiModelProperty("业务员销售部门sid") + private String staffDeptSid; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 6f71a79e1d..e770f84f27 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -200,9 +200,14 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService public List listAllVo(FinUncollectedReceivablesDetailedQuery query) { QueryWrapper qw = new QueryWrapper<>(); String useOrgSid = ""; + String staffDeptSid = ""; if (StringUtils.isNotBlank(query.getOrgPath())) { useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); query.setUseOrgSid(useOrgSid); + if(StringUtils.isNotBlank(query.getState()) && "0".equals(query.getState())){//销售专员申请 + staffDeptSid = query.getOrgPath().substring(query.getOrgPath().lastIndexOf("/") + 1); + query.setStaffDeptSid(staffDeptSid); + } } else { String createBySid = query.getCreateBySid(); useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData(); @@ -250,6 +255,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService qw.notLike("furd.receivablesName", "融资放款"); } } + if(StringUtils.isNotBlank(query.getStaffDeptSid())){ + qw.eq("furd.staffDeptSid",query.getStaffDeptSid()); + } List list = baseMapper.selectListAllVo(qw); return list; }