From 2f3d3fb97bd4ebdc00c40a2774465c8b3487b6d1 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 02 四月 2025 17:14:27 +0800 Subject: [PATCH] bug修改 --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java index d9f095d..5b8fc7c 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java @@ -3,27 +3,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sinata.common.entity.PageDTO; -import com.sinata.common.exception.ServiceException; import com.sinata.common.utils.BeanUtils; -import com.sinata.common.utils.CollUtils; import com.sinata.common.utils.StringUtils; import com.sinata.system.domain.MwMicroEquipment; -import com.sinata.system.domain.SysDepartment; import com.sinata.system.domain.dto.MwMicroEquipmentDTO; import com.sinata.system.domain.query.MwMicroEquipmentQuery; import com.sinata.system.domain.query.StorageRecordQuery; import com.sinata.system.domain.vo.MwMedicalWasteBoxVO; import com.sinata.system.domain.vo.MwMicroEquipmentVO; -import com.sinata.system.enums.DepartmentEnum; import com.sinata.system.enums.MicroEquipmentStatusEnum; import com.sinata.system.mapper.MwMicroEquipmentMapper; import com.sinata.system.service.MwMicroEquipmentService; import com.sinata.system.service.SysDepartmentService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - import java.util.List; import java.util.Objects; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; /** * <p> @@ -103,9 +98,13 @@ * @return */ @Override - public List<MwMicroEquipmentVO> getList() { - SysDepartment myDepartment = sysDepartmentService.getMyDepartment(); - if (Objects.nonNull(myDepartment)) { + public List<MwMicroEquipmentVO> getList(Long departmentId) { +// SysDepartment myDepartment = sysDepartmentService.getMyDepartment(); + List<MwMicroEquipment> list = this.lambdaQuery() + .eq(MwMicroEquipment::getStatus, MicroEquipmentStatusEnum.NORMAL.getCode()) + .eq(MwMicroEquipment::getDepartmentId, departmentId).list(); + return BeanUtils.copyList(list, MwMicroEquipmentVO.class); + /*if (Objects.nonNull(myDepartment)) { if (myDepartment.getOrgType().equals(DepartmentEnum.MEDICAL_INSTITUTION.getCode())) { List<MwMicroEquipment> list = this.lambdaQuery() .eq(MwMicroEquipment::getStatus, MicroEquipmentStatusEnum.NORMAL.getCode()) @@ -113,6 +112,7 @@ return BeanUtils.copyList(list, MwMicroEquipmentVO.class); } } - return CollUtils.emptyList(); + return CollUtils.emptyList();*/ + } } -- Gitblit v1.7.1