From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 c0fe593..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
@@ -6,7 +6,6 @@
import com.sinata.common.utils.BeanUtils;
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;
@@ -16,11 +15,10 @@
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>
@@ -100,11 +98,11 @@
* @return
*/
@Override
- public List<MwMicroEquipmentVO> getList() {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- //TODO 待完善
+ public List<MwMicroEquipmentVO> getList(Long departmentId) {
+// SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
List<MwMicroEquipment> list = this.lambdaQuery()
- .eq(MwMicroEquipment::getStatus, MicroEquipmentStatusEnum.NORMAL.getCode()).list();
+ .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())) {
--
Gitblit v1.7.1