From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期一, 17 二月 2025 11:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116' into dev-20250116
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java
index f865384..80b01df 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java
@@ -60,7 +60,7 @@
}
@Override
- public NonCoalPayDetailH5RepDto selectNonCoalPayByStu(String phone, String idCard) {
+ public List<NonCoalPayDetailH5RepDto> selectNonCoalPayByStu(String phone, String idCard) {
return nonCoalPayMapper.selectNonCoalPayByParam(phone, idCard);
}
@@ -128,6 +128,12 @@
if (!nonCoalPay.getDistrictCode().startsWith(Constants.DIS_XINJIANG_CODE)) {
throw new RuntimeException("地州信息错误");
}
+ if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ if (Constants.DIS_XINJIANG_CODE.equals(nonCoalPay.getDistrictCode())) {
+ throw new RuntimeException("仅可选择下级地州");
+ }
+
+ }
checkData(nonCoalPay);
NonCoalPay nonCoalPay1 = new NonCoalPay();
BeanUtils.copyProperties(nonCoalPay, nonCoalPay1);
--
Gitblit v1.9.2