diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 963affca0a..0347d53ac1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -513,17 +513,17 @@ public class BaseDistributorService extends MybatisBaseService qw = new QueryWrapper<>(); if (params != null) { + String orgPath = ""; + if (StringUtils.isBlank(params.getOrgPath())) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); + qw.eq("useOrg", orgPath); + } else { + orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); + qw.eq("useOrg", orgPath); + } if (StringUtils.isNotBlank(params.getOrgName())) { qw.like("disName", params.getOrgName()); } - if (StringUtils.isNotBlank(params.getOrgPath())) { - qw.eq("useOrg", params.getOrgPath()); - } else { - if (StringUtils.isNotBlank(params.getUserSid())) { - ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()); - qw.eq("useOrg", resultBean.getData()); - } - } } IPage pagging = baseMapper.getDistributorList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -555,13 +555,13 @@ public class BaseDistributorService extends MybatisBaseService qw = new QueryWrapper<>(); if (params != null) { - if (StringUtils.isNotBlank(params.getOrgPath())) { - qw.eq("bd.useOrg", params.getOrgPath()); + String orgPath = ""; + if (StringUtils.isBlank(params.getOrgPath())) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); + qw.eq("bd.useOrg", orgPath); } else { - if (StringUtils.isNotBlank(params.getUserSid())) { - ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()); - qw.eq("bd.useOrg", resultBean.getData()); - } + orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); + qw.eq("bd.useOrg", orgPath); } if (StringUtils.isNotBlank(params.getName())) { qw.like("bd.disName", params.getName()); @@ -704,7 +704,7 @@ public class BaseDistributorService extends MybatisBaseService + order by id desc