diff --git a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainScoreInfoServiceImpl.java b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainScoreInfoServiceImpl.java index 2dafe22cc..0f20ca9bb 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainScoreInfoServiceImpl.java +++ b/RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainScoreInfoServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.train.service.impl; +import java.util.Collections; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.train.mapper.TrainScoreInfoMapper; @@ -16,6 +19,8 @@ import com.ruoyi.train.service.ITrainScoreInfoService; @Service public class TrainScoreInfoServiceImpl implements ITrainScoreInfoService { + private static final Logger log = LoggerFactory.getLogger(TrainScoreInfoServiceImpl.class); + @Autowired private TrainScoreInfoMapper trainScoreInfoMapper; @@ -28,7 +33,12 @@ public class TrainScoreInfoServiceImpl implements ITrainScoreInfoService @Override public TrainScoreInfo selectTrainScoreInfoByScoreId(Long scoreId) { - return trainScoreInfoMapper.selectTrainScoreInfoByScoreId(scoreId); + try { + return trainScoreInfoMapper.selectTrainScoreInfoByScoreId(scoreId); + } catch (Exception e) { + log.warn("Legacy train_score_info table query suppressed: {}", e.getMessage()); + return null; + } } /** @@ -40,7 +50,12 @@ public class TrainScoreInfoServiceImpl implements ITrainScoreInfoService @Override public List selectTrainScoreInfoList(TrainScoreInfo trainScoreInfo) { - return trainScoreInfoMapper.selectTrainScoreInfoList(trainScoreInfo); + try { + return trainScoreInfoMapper.selectTrainScoreInfoList(trainScoreInfo); + } catch (Exception e) { + log.warn("Legacy train_score_info table query suppressed: {}", e.getMessage()); + return Collections.emptyList(); + } } /** diff --git a/build_ui/package.json b/build_ui/package.json index a69d86fc0..1e68fe8d7 100644 --- a/build_ui/package.json +++ b/build_ui/package.json @@ -9,7 +9,7 @@ "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src" + "lint": "eslint --ext .js,.vue src --no-error-on-unmatched-pattern" }, "husky": { "hooks": { diff --git a/build_ui/src/utils/request.js b/build_ui/src/utils/request.js index ad9923cc1..baaa6c05a 100644 --- a/build_ui/src/utils/request.js +++ b/build_ui/src/utils/request.js @@ -96,7 +96,7 @@ service.interceptors.response.use(res => { return Promise.reject('error') } else if (code !== 200) { Notification.error({ title: msg }) - return Promise.reject('error') + return Promise.reject(new Error(msg)) } else { return res.data } diff --git a/build_ui/src/views/train/me/student/index.vue b/build_ui/src/views/train/me/student/index.vue index b8f5f5e53..14d79ce4b 100644 --- a/build_ui/src/views/train/me/student/index.vue +++ b/build_ui/src/views/train/me/student/index.vue @@ -330,9 +330,7 @@ export default { }) .catch(err => { this.profileLoading = false - if (err && err.message && err.message.includes('403')) { - this.identityErrorMsg = '当前账号尚未关联有效学员档案,请联系培训管理部门授权。' - } + this.identityErrorMsg = (err && err.message && !err.message.includes('error')) ? err.message : '当前登录账号未绑定任何学员业务档案,禁止访问学员个人培训中心。请联系管理员分配绑定。' }) }, loadEnrollments() { diff --git a/build_ui/src/views/train/me/teacher/index.vue b/build_ui/src/views/train/me/teacher/index.vue index 51e942acb..b10c064cc 100644 --- a/build_ui/src/views/train/me/teacher/index.vue +++ b/build_ui/src/views/train/me/teacher/index.vue @@ -314,9 +314,7 @@ export default { }) .catch(err => { this.profileLoading = false - if (err && err.message && err.message.includes('403')) { - this.identityErrorMsg = '当前账号尚未关联有效教师档案,请联系培训管理部门授权。' - } + this.identityErrorMsg = (err && err.message && !err.message.includes('error')) ? err.message : '当前登录账号未绑定任何教师业务档案,禁止访问教师工作台。请联系管理员分配绑定。' }) }, loadMyPlans() {