Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-27 43c263df4d8ce0cc830f287780c29db8a2b47f0f

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AgreementServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,8 +7,6 @@
import com.ruoyi.system.mapper.AgreementMapper;
import com.ruoyi.system.service.IAgreementService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * <p>
@@ -22,14 +19,11 @@
@Service
public class AgreementServiceImpl extends ServiceImpl<AgreementMapper, Agreement> implements IAgreementService {

    @Resource
    private  IAgreementService iAgreementService;

    @Override
    public Agreement getAgreement(Integer agreementType) {
        LambdaQueryWrapper<Agreement> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Agreement::getAgreementType,agreementType);
        wrapper.eq(Agreement::getDelFlag,0);
        return iAgreementService.getOne(wrapper);
        return this.getOne(wrapper);
    }
}