diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index fbd37b7..c2cb75d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -316,7 +316,8 @@ }); //登录用户id获取计量人员id,实验室检测信息中存储的是计量人员id MeterStaff meterStaff = getMeterStaffInfo(user); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); +// if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if(Objects.isNull(meterStaff)) return new Page<>(); Long userId = meterStaff.getId(); String measureStatus = labExecutiveListRequest.getMeasureStatus(); @@ -365,7 +366,8 @@ //登录用户id获取计量人员id,实验室检测信息中存储的是计量人员id AuthUser user = ShiroKit.getUser(); MeterStaff meterStaff = getMeterStaffInfo(user); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); +// if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if(Objects.isNull(meterStaff)) return new ArrayList<>(); Long userId = meterStaff.getId(); Page page = getSampleLabExecutiveListResponsePage(); Page page1 = getSampleLabExecutiveListResponsePage();