Merge branch 'dev_staff_info' into develop

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java

@@ -15,6 +15,8 @@ import java.util.List;
 public class StaffDetailV2FormDTO implements Serializable {
     private static final long serialVersionUID = -1974456701949979946L;
 
+    //工作人员所属组织
+    private String agencyId = "";
     //工作人员用户id
     private String staffId = "";
     //工作人员姓名

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -429,6 +429,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         }
 
         //3.封装数据并返回
+        result.setAgencyId(list.get(0).getAgencyId());
         result.setOrgId(list.get(0).getOrgId());
         result.setOrgName(list.get(0).getOrgName());
         result.setOrgType(list.get(0).getOrgType());

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java

@@ -59,4 +59,8 @@ public class MineResultDTO implements Serializable {
 	 * 根组织
 	 */
 	private String rootAgencyId;
+    /**
+     * 根组织名
+     */
+    private String rootAgencyName;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -234,9 +234,13 @@ public class StaffServiceImpl implements StaffService {
 		//获取根组织
 		CustomerAgencyDTO agency = customerAgencyService.get(customerStaffAgency.getAgencyId());
 		if (StringUtils.isNotBlank(agency.getPids())) {
-			result.setRootAgencyId(agency.getPids().split(StrConstant.COLON)[0]);
+            String rootAgencyId = agency.getPids().split(StrConstant.COLON)[0];
+            CustomerAgencyDTO rootAgency = customerAgencyService.get(rootAgencyId);
+			result.setRootAgencyId(rootAgencyId);
+            result.setRootAgencyName(rootAgency.getOrganizationName());
 		} else {
 			result.setRootAgencyId(customerStaffAgency.getAgencyId());
+            result.setRootAgencyName(agency.getOrganizationName());
 		}
 		//2021.08.27 zhaoqf end
 		return result;