/gov/org/staff/addstaffv2兼容运营端调用;staff/editstaff调整报错提示

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

@@ -101,7 +101,7 @@ public class StaffController {
 	 */
 	@PostMapping("editstaff")
 	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_UPDATE)
-	public Result editStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitFromDTO fromDTO){
+	public Result editStaff(@RequestBody StaffSubmitFromDTO fromDTO){
 		ValidatorUtils.validateEntity(fromDTO);
 		return staffService.editStaff(fromDTO);
 	}

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

@@ -216,14 +216,12 @@ public class StaffServiceImpl implements StaffService {
 			CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
 			fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
 		}
+		// epmetUserFeignClient.editStaff没有用到这俩参数，就注释了。
 		// fromDTO.setApp(tokenDto.getApp());
 		// fromDTO.setClient(tokenDto.getClient());
 		Result result = epmetUserFeignClient.editStaff(fromDTO);
 		if (!result.success()) {
-			if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) {
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),result.getInternalMsg(),result.getMsg());
-				return new Result().error(result.getCode(), result.getMsg());
-			}
-			return new Result().error(EpmetErrorCode.STAFF_EDIT_FAILED.getCode(), EpmetErrorCode.STAFF_EDIT_FAILED.getMsg());
 		}
 		// if (tokenDto.getClient().equals("web")){
 			if(CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){
@@ -584,10 +582,7 @@ public class StaffServiceImpl implements StaffService {
 		submitDTO.setAgencyId(orgDTO.getAgencyId());
 		Result<CustomerStaffDTO> result = epmetUserFeignClient.addStaff(submitDTO);
 		if (!result.success()) {
-			if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) {
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),result.getInternalMsg(),result.getMsg());
-				return new Result().error(result.getCode(), result.getMsg());
-			}
-			return new Result().error(EpmetErrorCode.STAFF_ADD_FAILED.getCode(), EpmetErrorCode.STAFF_ADD_FAILED.getMsg());
 		}
 
 		//3.人员机关表总人数加一、关系表新增关系数据

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

@@ -470,7 +470,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         customerStaffFormDTO.setMobile(fromDTO.getMobile());
         CustomerStaffDTO customerStaffDTO = baseDao.selectListCustomerStaffInfo(customerStaffFormDTO);
         if (null != customerStaffDTO && !fromDTO.getStaffId().equals(customerStaffDTO.getUserId())) {
-            return new Result<CustomerStaffDTO>().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg());
+            // return new Result<CustomerStaffDTO>().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg());
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"手机号已存在","手机号已存在");
         }
 
         CustomerStaffEntity customerStaffEntity = baseDao.selectByUserId(fromDTO.getStaffId());