后端代码提交

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerRecMapper.java

@@ -21,7 +21,7 @@ public interface CustomerRecMapper extends BaseMapper<CustomerRec> {
     CustomerRec selectByPrimaryKeyHasBase64(Integer id);
     List<CustomerRec> selectByCustomerName(String customerName);
     List<CustomerRec> selectByCustomerNameAll(String customerName);
-
+    List<CustomerRec> selectByCustomerNameCpAll(@Param("customerRec") CustomerRec record);
     CustomerRec selectByCustomerNameAndCompany(CustomerRec record);
     CustomerRec selectByCustomerNameAndCompanyConcat(CustomerRec record);
     CustomerRec selectByCustomerNameAndCompanyReference(CustomerRec record);

src/main/java/com/jkcredit/invoice/service/lowerService/impl/CustomerLowerServiceImpl.java

@@ -142,7 +142,7 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
             return new RespR(customerRecsN); TODO
         }*/
 
-        return new RespR(customerRecMapper.selectByCustomerNameAll(customerRec.getCustomerName()));
+        return new RespR(customerRecMapper.selectByCustomerNameCpAll(customerRec));
     }
     @Override
     public RespR customeRecQuery(CustomerRec customerRec) {

src/main/resources/mapper/customer/CustomerRecMapper.xml

@@ -104,6 +104,15 @@
         from t_customer_rec
         where customerName = #{customerName,jdbcType=VARCHAR}
     </select>
+  <select id="selectByCustomerNameCpAll" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
+    select
+    <include refid="Base_Column_List" />
+    from t_customer_rec
+    where customerName = #{customerRec.customerName,jdbcType=VARCHAR}
+    <if test="customerRec.companyName != null and customerRec.companyName != ''">
+      and company_name  LIKE CONCAT('%',#{customerRec.companyName},'%')
+    </if>
+  </select>
     <select id="selectByCustomerNameAndCompany" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
         select
         <include refid="Base_Column_List" />