diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml index ece1fb40..c6b20c28 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml @@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and s.customer_purser like concat('%', #{customerPurser}, '%') and s.customer_abbreviation like concat('%', #{customerAbbreviation}, '%') and s.delivery_address like concat('%', #{deliveryAddress}, '%') - and s.first_add_time between #{params.beginCreateTime} and #{params.endCreateTime} + and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime} and s.customer_sign = #{customerSign} order by s.audit_status asc, s.create_time desc diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html index e6fd24d9..0f29bfaf 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html @@ -545,9 +545,6 @@ }, {title: '录入时间',field: 'createTime', sortable: true, - formatter: function (value, row, index) { - if (value == null) {return " ";} else { return value;} - } }, {title: '上次修改时间',field: 'updateTime',}, {title: '操作',align: 'center',