From aded6d51dd8cc3b7d2b5a9a0be54378c5b2ee924 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 01 一月 2025 15:11:15 +0800 Subject: [PATCH] merge --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBusinessDeviceServiceImpl.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBusinessDeviceServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBusinessDeviceServiceImpl.java index 563757a..6a13cf4 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBusinessDeviceServiceImpl.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBusinessDeviceServiceImpl.java @@ -5,6 +5,7 @@ import com.sinata.common.entity.PageDTO; import com.sinata.common.exception.ServiceException; import com.sinata.common.utils.BeanUtils; +import com.sinata.common.utils.StringUtils; import com.sinata.system.domain.MwBusinessDevice; import com.sinata.system.domain.dto.MwBusinessDeviceDTO; import com.sinata.system.domain.query.MwBusinessDeviceQuery; @@ -39,6 +40,9 @@ @Override public PageDTO<MwBusinessDeviceVO> pageList(MwBusinessDeviceQuery query) { String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId()); + if (StringUtils.isBlank(treeCode)) { + return PageDTO.empty(0L, 0L); + } Page<MwBusinessDeviceVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode); return PageDTO.of(page); } -- Gitblit v1.7.1