Merge branch 'dev_staff_info' into develop

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<String> staffIds;
+    //token中用户Id
+    private String staffId;
     public interface OrgStaff extends CustomerClientShowGroup {}
 
 }

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<OrgStaffListResultDTO>().ok(govOrgService.staffList(formDTO));
     }
 

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<ListStaffResultDTO> staffList = epmetUserService.getStaffInfoList(formDTO);