非空判断

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzTeacherServiceImpl.java

@@ -9,6 +9,7 @@ import com.ruoyi.dz.domain.DzSchool;
 import com.ruoyi.dz.mapper.DzSchoolMapper;
 import com.ruoyi.enums.UserTypeEnum;
 import com.ruoyi.system.service.ISysUserService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.dz.mapper.DzTeacherMapper;
@@ -55,13 +56,15 @@ public class DzTeacherServiceImpl implements IDzTeacherService
         List<DzTeacher> list = dzTeacherMapper.selectDzTeacherList(dzTeacher);
         //填充campusName,得到campusIds
         List<Long> campusIds = list.stream().map(DzTeacher::getCampusId).collect(Collectors.toList());
-        Map<Long, DzSchool> schoolMap = schoolMapper.selectDzSchoolListByIds(campusIds)
-                .stream().collect(Collectors.toMap(DzSchool::getId,school -> school,
-                        (existing, replacement) -> existing  // 如果key重复，保留已存在的
-                ));
-        for (DzTeacher teacher : list) {
-            if (schoolMap.containsKey(teacher.getCampusId())){
-                teacher.setCampusName(schoolMap.get(teacher.getCampusId()).getName());
+        if (CollectionUtils.isNotEmpty(campusIds)){
+            Map<Long, DzSchool> schoolMap = schoolMapper.selectDzSchoolListByIds(campusIds)
+                    .stream().collect(Collectors.toMap(DzSchool::getId,school -> school,
+                            (existing, replacement) -> existing  // 如果key重复，保留已存在的
+                    ));
+            for (DzTeacher teacher : list) {
+                if (schoolMap.containsKey(teacher.getCampusId())){
+                    teacher.setCampusName(schoolMap.get(teacher.getCampusId()).getName());
+                }
             }
         }
         return list;