diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index 113f412c..e0abfa15 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -413,17 +413,29 @@ public class UserUpdateExe { userChangeRecordE.executeReviewStatus(userEOld, UserEmploymentFlagEnum.ON.getCode(), UserChangeRecordStatusEnum.APPROVED.getCode()); userCorpRecordE.setStartTime(LocalDateTime.now()); userChangeRecordGateway.add(userChangeRecordE); - log.info("GBS获取用户信息开始,用户id:{}", userDO.getId()); - SingleResponse detail = userFacade.getDetail(userDO.getId()); - log.info("GBS获取用户信息结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(detail)); - if (detail.isSuccess() && detail.getData() != null ) { + SingleResponse detail = null; + try{ + log.info("GBS获取用户信息开始,用户id:{}", userDO.getId()); + detail = userFacade.getDetail(userDO.getId()); + log.info("GBS获取用户信息结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(detail)); + }catch (Exception e){ + e.printStackTrace(); + log.info("GBS获取用户信息异常,用户id:{},错误信息:{}", userDO.getId(), e.getMessage()); +// throw new BizException("GBS获取用户信息异常"); + } + + if (detail!=null && detail.isSuccess() && detail.getData() != null ) { if( !detail.getData().getJobStatusEnum()){ //离职,重新入职 UserUpdateQuitCmd userUpdateQuitCmd = new UserUpdateQuitCmd(); userUpdateQuitCmd.setId(userDO.getId()); log.info("executeXgf,GBS恢复用户入职请求: {}",JSONUtil.toJsonStr(userUpdateQuitCmd)); - Response response = userFacade.restoreJob(userUpdateQuitCmd); - log.info("executeXgf,GBS恢复用户入职返回: {}",JSONUtil.toJsonStr(response)); + try{ + Response response = userFacade.restoreJob(userUpdateQuitCmd); + log.info("executeXgf,GBS恢复用户入职返回: {}",JSONUtil.toJsonStr(response)); + }catch (Exception e){ + log.info("executeXgf,GBS恢复用户入职异常: {}",e.getMessage()); + } }else{ //在职,不处理 } @@ -449,8 +461,6 @@ public class UserUpdateExe { } userDO.setId(gbsResult.getData()); } - - } else { //驳回 //驳回