Merge remote-tracking branch 'origin/master'

zss

2023-08-07 78c62a33671bdcfb0f2019c520f807a4c56fc741

 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;
        }
    }