From 83488c1cbce53028c9602d2fc96005528d11fb4c Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 08 八月 2023 14:08:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java
index f7882e9..66d8c86 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java
@@ -29,19 +29,6 @@
@Override
public Integer addClassifyInformation(Classify classify) {
- if (ObjectUtils.isEmpty(classify.getFatherName())){
- classify.setFatherName(classify.getSonName());
- classify.setSonName(null);
- LambdaQueryWrapper<Classify> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Classify::getFatherName, classify.getFatherName());
- wrapper.isNull(Classify::getSonName);
- wrapper.eq(Classify::getState, 1);
- Classify classify1 = classifyMapper.selectOne(wrapper);
- if (ObjectUtils.isEmpty(classify1)){
- return classifyMapper.insert(classify);
- }
- return 2;
- }
LambdaQueryWrapper<Classify> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Classify::getFatherName, classify.getFatherName());
wrapper.eq(Classify::getSonName, classify.getSonName());
@@ -50,7 +37,7 @@
if (ObjectUtils.isEmpty(classify1)){
return classifyMapper.insert(classify);
} else {
- return 3;
+ return 2;
}
}
--
Gitblit v1.9.3