From 24ba608e289a73d18a25225f595a1d1b7fa3f3cb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 Oct 2022 13:18:46 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/staff/addstaffv2=E8=BF=94=E5=9B=9Estaf?=
 =?UTF-8?q?fId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/StaffController.java  | 3 ++-
 .../src/main/java/com/epmet/service/StaffService.java    | 3 ++-
 .../java/com/epmet/service/impl/StaffServiceImpl.java    | 9 +++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
index 939f740fc1..4f2c228243 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
@@ -196,11 +196,12 @@ public class StaffController {
 
 	/**
 	 * 【通讯录】人员添加v2
+	 * 返回staffId
 	 * @author sun
 	 */
 	@PostMapping("addstaffv2")
 	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_CREATE)
-	public Result addStaffV2(@LoginUser TokenDto tokenDto, @RequestBody AddStaffV2FromDTO fromDTO){
+	public Result<StaffDetailResultDTO> addStaffV2(@LoginUser TokenDto tokenDto, @RequestBody AddStaffV2FromDTO fromDTO){
 		ValidatorUtils.validateEntity(fromDTO, AddStaffV2FromDTO.AddStaff.class);
 		fromDTO.setCustomerId(tokenDto.getCustomerId());
 		fromDTO.setApp(tokenDto.getApp());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
index fc2f954b02..9d9929a9ae 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
@@ -134,9 +134,10 @@ public interface StaffService {
 
 	/**
 	 * 【通讯录】人员添加v2
+	 * 返回staffId
 	 * @author sun
 	 */
-    Result addStaffV2(AddStaffV2FromDTO fromDTO);
+    Result<StaffDetailResultDTO> addStaffV2(AddStaffV2FromDTO fromDTO);
 
 
 	/**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index 6950cbcc3c..9dc4670192 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -537,7 +537,7 @@ public class StaffServiceImpl implements StaffService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Result addStaffV2(AddStaffV2FromDTO fromDTO) {
+	public Result<StaffDetailResultDTO> addStaffV2(AddStaffV2FromDTO fromDTO) {
 		//1.根据新增人员类型判断查询机关信息
 		OrgResultDTO orgDTO = customerAgencyDao.selectAgencyDetail(fromDTO.getOrgId(), fromDTO.getOrgType());
 		if (null == orgDTO) {
@@ -612,8 +612,13 @@ public class StaffServiceImpl implements StaffService {
 				throw new EpmetException("save data to gov-role-user failure");
 			}
 		}
+		//如果是烟台的需要更新 根据手机号+姓名 更新data_sync_user_data置为已创建、记录staffId
+		// todo
 
-		return new Result();
+		//2022.10.18加个返参，借用下StaffDetailResultDTO不再新建dto了
+		StaffDetailResultDTO resultDTO=new StaffDetailResultDTO();
+		resultDTO.setStaffId(result.getData().getUserId());
+		return new Result<StaffDetailResultDTO>().ok(resultDTO);
 	}