From 4d0f03606aa9030e70ced69fb0f5bdfea7196395 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 29 五月 2024 11:20:52 +0800
Subject: [PATCH] fix：统计部门加上删除标识
---
src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 32014ce..bf9c107 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java
@@ -1,6 +1,9 @@
package com.mindskip.xzs.service.impl;
+import com.mindskip.xzs.context.WebContext;
import com.mindskip.xzs.domain.Subject;
+import com.mindskip.xzs.repository.BaseMapper;
+import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.SubjectMapper;
import com.mindskip.xzs.service.SubjectService;
import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM;
@@ -9,17 +12,21 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
public class SubjectServiceImpl extends BaseServiceImpl<Subject> implements SubjectService {
private final SubjectMapper subjectMapper;
+ private final WebContext webContext;
+ private final DepartmentMapper departmentMapper;
- @Autowired
- public SubjectServiceImpl(SubjectMapper subjectMapper) {
- super(subjectMapper);
+ public SubjectServiceImpl(BaseMapper<Subject> baseMapper, SubjectMapper subjectMapper, WebContext webContext, DepartmentMapper departmentMapper) {
+ super(baseMapper);
this.subjectMapper = subjectMapper;
+ this.webContext = webContext;
+ this.departmentMapper = departmentMapper;
}
@Override
@@ -39,7 +46,13 @@
@Override
public List<Subject> allSubject() {
- return subjectMapper.allSubject();
+ // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛屽彧鏌ュ叧鑱旇閮ㄩ棬鐨勮鐩�
+ boolean deptAdmin = webContext.isDeptAdmin();
+ List<Integer> deptIds = new ArrayList<>();
+ if (deptAdmin) {
+ deptIds = webContext.getAdminDeptIds();
+ }
+ return subjectMapper.allSubject(deptIds);
}
@Override
--
Gitblit v1.8.0