diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml index fc7ab24..33a330c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml @@ -31,8 +31,8 @@ customer_contact.contacts,customer_contact.mobile,customer_info.userMax,customer_contact.email,customer_contact.tel,customer_info.companyName ,auth_role.`name` role FROM customer_info - INNER JOIN customer_contact on customer_info.customerId=customer_contact.customerId - INNER JOIN auth_role on customer_info.roleId = auth_role.id + left JOIN customer_contact on customer_info.customerId=customer_contact.customerId + left JOIN auth_role on customer_info.roleId = auth_role.id AND customer_info.customerName LIKE concat('%',#{customerName},'%') diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml index 36edfc7..a956569 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml @@ -40,7 +40,7 @@ AND checkStatus = #{checkStatus} - AND customerId = #{customerId} + AND thr_products_add.customerId = #{customerId} AND companyName = #{companyName}