From c9da1b0da1178911e383ddcaebecd1e088fa6004 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:37:07 +0800
Subject: [PATCH] 修改bug
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
index d69e41b..c3af267 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.mapper.InstrumentMapper;
+import com.yuanchu.limslaboratory.pojo.User;
import com.yuanchu.limslaboratory.service.InstrumentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.utils.JsonUtil;
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -30,6 +33,9 @@
@Resource
private InstrumentMapper instrumentMapper;
+
+ @Resource
+ private UserMapper userMapper;
@Override
public Integer addInstrumentInformation(Instrument instrument) {
@@ -60,10 +66,14 @@
}
@Override
- public Instrument getIdInstrumentInformation(Integer instrumentId) {
+ public Map<String, Object> getIdInstrumentInformation(Integer instrumentId) {
LambdaQueryWrapper<Instrument> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Instrument::getId, instrumentId);
- return instrumentMapper.selectOne(wrapper);
+ Instrument instrument = instrumentMapper.selectOne(wrapper);
+ User user = userMapper.selectById(instrument.getUserId());
+ Map<String, Object> map = JsonUtil.jsonToPojo(JsonUtil.jsonToString(instrument), Map.class);
+ map.put("userName",user.getName());
+ return map;
}
@Override
--
Gitblit v1.9.3