Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_c...

liujie

2025-11-06 c2f0603d45c6ed4e189329f6460f94af1eb3df53

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMerchantTypeServiceImpl.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.core.domain.BasePage;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TMerchantTypeMapper;
import com.ruoyi.system.model.TMerchantType;
import com.ruoyi.system.model.TMerchantType;
import com.ruoyi.system.service.TMerchantTypeService;
import com.ruoyi.system.vo.TNoticeVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +25,22 @@
@Service
public class TMerchantTypeServiceImpl extends ServiceImpl<TMerchantTypeMapper, TMerchantType> implements TMerchantTypeService {

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

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