Merge remote-tracking branch 'origin/master'

无关风月

2025-11-06 abf4b17f33b749269bd37d14b8dc0e55aff9b1d1

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMerchantServiceImpl.java

@@ -1,10 +1,18 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TMerchantMapper;
import com.ruoyi.system.model.TMerchant;
import com.ruoyi.system.model.TMerchant;
import com.ruoyi.system.query.TMerchantQuery;
import com.ruoyi.system.service.TMerchantService;
import com.ruoyi.system.vo.TPartyBuildingVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +25,22 @@
@Service
public class TMerchantServiceImpl extends ServiceImpl<TMerchantMapper, TMerchant> implements TMerchantService {

    @Override
    public boolean isExit(TMerchant dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TMerchant.class).ne(TMerchant::getId, dto.getId()).eq(TMerchant::getMerchantName, dto.getMerchantName())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TMerchant.class).eq(TMerchant::getMerchantName, dto.getMerchantName())) > 0;
        }
    }

    @Override
    public PageInfo<TMerchant> pageList(TMerchantQuery query) {
        PageInfo<TMerchant> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TMerchant> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}