Merge remote-tracking branch 'origin/dhdc' into dhdc

gongchunyi

4 天以前 82402ef5ae74acd08815005cec52d9a959ddea06

Merge remote-tracking branch 'origin/dhdc' into dhdc

 src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java

@@ -1,11 +1,13 @@
package com.ruoyi.account.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.mapper.EnterpriseFixedAssetsMapper;
import com.ruoyi.account.pojo.EnterpriseFixedAssets;
import com.ruoyi.account.service.EnterpriseFixedAssetsService;
import com.ruoyi.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +21,10 @@

    @Override
    public IPage<EnterpriseFixedAssets> listPage(Page<EnterpriseFixedAssets> page, EnterpriseFixedAssets enterpriseFixedAssets) {
        return enterpriseFixedAssetsmapper.selectPage(page, null);
        LambdaQueryWrapper<EnterpriseFixedAssets> queryWrapper = new LambdaQueryWrapper<>();
        if (enterpriseFixedAssets != null && StringUtils.isNotBlank(enterpriseFixedAssets.getName())) {
            queryWrapper.like(EnterpriseFixedAssets::getName, enterpriseFixedAssets.getName());
        }
        return enterpriseFixedAssetsmapper.selectPage(page, queryWrapper);
    }
}

 src/main/java/com/ruoyi/basic/pojo/Customer.java

@@ -35,6 +35,10 @@
    @Excel(name = "客户名称")
    private String customerName;

    /** 客户分类：零售客户，进销商客户 */
    @Excel(name = "客户分类")
    private String customerType;

    /**
     * 纳税人识别号
     */

 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java

@@ -75,9 +75,13 @@
        // 2. 构建查询条件（增强空值安全）
        LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
        String customerName = customer.getCustomerName();
        String customerType = customer.getCustomerType();
        if (StringUtils.isNotBlank(customerName)) {
            queryWrapper.like(Customer::getCustomerName, customerName);
        }
        if (StringUtils.isNotBlank(customerType)) {
            queryWrapper.like(Customer::getCustomerType, customerType);
        }

        // 3. 执行分页查询（保留分页元数据）
        IPage<Customer> customerPage = customerMapper.selectPage(page, queryWrapper);