From e00aba822aa63cc74f99ce3cf80d4124389f4c91 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 27 Aug 2021 10:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=9A=E8=AE=AF=E5=BD=95=E3=80=91?= =?UTF-8?q?=E7=BB=84=E7=BB=87/=E9=83=A8=E9=97=A8/=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E4=B8=8B=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/govorg/form/OrgStaffListFormDTO.java | 6 ++++++ .../com/epmet/dataaggre/controller/GovOrgController.java | 1 + .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java index add6167998..7d0ed2f595 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java @@ -35,10 +35,16 @@ public class OrgStaffListFormDTO implements Serializable { */ @Min(value = 1, message = "每页条数必须大于0", groups = OrgStaffListFormDTO.OrgStaff.class) private Integer pageSize = 10; + /** + * 是否包括我（1 是，0 否）默认值1 + */ + private String includeMe = "1"; //客户Id private String customerId; //工作人员id集合 private List staffIds; + //token中用户Id + private String staffId; public interface OrgStaff extends CustomerClientShowGroup {} } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 3f3020c147..b42b8aef17 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -136,6 +136,7 @@ public class GovOrgController { throw new RenException("参数类型错误"); } formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); return new Result().ok(govOrgService.staffList(formDTO)); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 3eb77fe2dd..3def866d1e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -393,6 +393,10 @@ public class GovOrgServiceImpl implements GovOrgService { return resultDTO; } formDTO.setStaffIds(staffIds); + //是否包含自己 + if("0".equals(formDTO.getIncludeMe())){ + staffIds.removeIf(s->s.equals(formDTO.getStaffId())); + } //2.分页查询工作人员基础信息、角色信息【组织人员单位领导角色人员在前；部门人员部门领导角色人员在前；网格人员网格长角色人员在前】 List staffList = epmetUserService.getStaffInfoList(formDTO);