/gov/org/staff/editstaffinit 返参增加agencyId

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java

@@ -14,6 +14,7 @@ import java.io.Serializable;
 @Data
 public class StaffInfoFromDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
+	public interface EditStaffInitGroup {}
 	/**
 	 * 客户ID
 	 */
@@ -26,5 +27,6 @@ public class StaffInfoFromDTO implements Serializable {
 	/**
 	 * 用户ID
 	 */
-	String staffId;
+	@NotBlank(message = "staffId不能为空",groups = EditStaffInitGroup.class)
+	private String staffId;
 }

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

@@ -46,4 +46,8 @@ public class StaffInitResultDTO implements Serializable {
 	 */
 	private List<StaffRoleResultDTO> roleList;
 	private List<StaffRoleResultDTO> newRoleList;
+	/**
+	 * customer_staff_agency.agency_id
+	 */
+	private String agencyId;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -70,6 +70,7 @@ public class StaffController {
 	@PostMapping("editstaffinit")
 	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_DETAIL)
 	public Result<StaffInitResultDTO> editStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
+		ValidatorUtils.validateEntity(fromDTO,StaffInfoFromDTO.EditStaffInitGroup.class);
 		return staffService.editStaffInit(fromDTO);
 	}
 

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

@@ -150,7 +150,15 @@ public class StaffServiceImpl implements StaffService {
 			CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
 			fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
 		}
-		return epmetUserFeignClient.editStaffInit(fromDTO);
+		CustomerStaffAgencyDTO customerStaffAgencyDTO=customerStaffAgencyService.getInfoByUserId(fromDTO.getStaffId());
+		if (null == customerStaffAgencyDTO) {
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customer_staff_agency is null user_id :" + fromDTO.getStaffId(), "查询用户所属组织为空");
+		}
+		Result<StaffInitResultDTO> res=epmetUserFeignClient.editStaffInit(fromDTO);
+		if (res.success() && null != res.getData()) {
+			res.getData().setAgencyId(customerStaffAgencyDTO.getAgencyId());
+		}
+		return new Result<StaffInitResultDTO>().ok(res.getData());
 	}
 
 	@Override

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -288,7 +288,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         //获取工作人员信息
         CustomerStaffDTO customerStaffDTO = baseDao.selectStaffInfo(fromDTO);
         if (null == customerStaffDTO) {
-            log.warn("工作人员不存在");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"customer_staff is null userId："+fromDTO.getStaffId(),"工作人员不存在");
         }
         if (StringUtils.isBlank(customerStaffDTO.getHeadPhoto())) {
             customerStaffDTO.setHeadPhoto("");