Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-30 10ca479bf55120b338f9d2c6b1e3100190b5a035

 src/main/java/com/mindskip/xzs/repository/SubjectMapper.java

@@ -3,6 +3,7 @@
import com.mindskip.xzs.domain.Subject;
import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -11,9 +12,17 @@

    List<Subject> getSubjectByLevel(Integer level);

    List<Subject> allSubject();
    List<Subject> allSubject(@Param("deptIds") List<Integer> deptIds, @Param("admin") Boolean admin);

    List<Subject> page(SubjectPageRequestVM requestVM);

    Subject getName(String name);

    List<Subject> getNames(@Param("names") String[] names);

    List<Subject> selectByIds(@Param("ids") Integer[] ids);

    List<String> selectSubjectName(@Param("ids") List<Integer> ids);

    String selectSubjectNameById(Integer id);
}