From 79d280be1b9e36ff8a252c4553c685c13886d0b2 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 04 七月 2024 09:30:59 +0800
Subject: [PATCH] feat：避免判断题答案存中文
---
src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java
index bf9c107..609b7b1 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java
@@ -2,6 +2,7 @@
import com.mindskip.xzs.context.WebContext;
import com.mindskip.xzs.domain.Subject;
+import com.mindskip.xzs.domain.enums.RoleEnum;
import com.mindskip.xzs.repository.BaseMapper;
import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.SubjectMapper;
@@ -46,13 +47,10 @@
@Override
public List<Subject> allSubject() {
- // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛屽彧鏌ュ叧鑱旇閮ㄩ棬鐨勮鐩�
- boolean deptAdmin = webContext.isDeptAdmin();
- List<Integer> deptIds = new ArrayList<>();
- if (deptAdmin) {
- deptIds = webContext.getAdminDeptIds();
- }
- return subjectMapper.allSubject(deptIds);
+ // 鍙煡鑷繁閮ㄩ棬鐨勮鐩�
+ List<Integer> deptIds = webContext.getAdminDeptIds();
+ Boolean admin = RoleEnum.ADMIN.getCode().equals(webContext.getCurrentUser().getRole());
+ return subjectMapper.allSubject(deptIds, admin);
}
@Override
@@ -77,4 +75,8 @@
return subjectMapper.selectByIds(ids);
}
+ @Override
+ public List<Subject> listByDeptId(Integer deptId) {
+ return subjectMapper.listByDeptId(deptId);
+ }
}
--
Gitblit v1.8.0