diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java index 1682fdc..82ce7a0 100644 --- a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java +++ b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java @@ -843,6 +843,13 @@ public class ISrsDormitoryStudentServiceImpl extends ServiceImpl stuList = srsDormitoryStudentMapper.listSmokeEarly(teacherEmployeeId); + + List kshList = stuList.stream().map(SrsStuReg::getKSH).collect(Collectors.toList()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("ksh",kshList); + _newRegMapper.delete(queryWrapper); + List dormList = srsDormitoryStudentMapper.listFdyCanDorm(teacherEmployeeId); // 查询所有已分配的ksh,避免重复插入 diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml index ff266d7..0601499 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml @@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.dormitory_id = #{dormitoryId} and b.BJDM = #{classCode} + order by a.ksh asc