From dd301742784e570ec01098907f56e5c9c19b5a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 17:26:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
index 086b6b2..c048f49 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
@@ -12,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -51,13 +53,10 @@
}
@Override
- public Map<String, Object> obtainItemParameterList(Page page, Laboratory itemParameter) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(Laboratory.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("obtainItemParameterList");
- if(map1.get("look")==1) itemParameter.setCreateUser(map1.get("userId"));
- map.put("body", laboratoryMapper.obtainItemParameterList(page, QueryWrappers.queryWrappers(itemParameter)));
- return map;
+ public List<Laboratory> obtainItemParameterList() {
+ return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName, Laboratory::getId));
}
+
+
}
--
Gitblit v1.9.3