diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java index 4864d34..84e54dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java @@ -72,7 +72,6 @@ public class CompanyController extends BaseController @ResponseBody public TableDataInfo list(Company company) { - getUserId(); startPage(); // 运营者账号，只能查询所属商户数据 if(UserConstants.USER_TYPE_02 .equals(getSysUser().getUserType())){ diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserFeedbackMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserFeedbackMapper.xml index f2e1813..bc01943 100644 --- a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserFeedbackMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserFeedbackMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and user_id = #{userId} and user_name like concat('%', #{userName}, '%') - and phone_number = #{phoneNumber} + and phone_number like concat('%', #{phoneNumber}, '%') and feedback_content = #{feedbackContent} diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml index be19bb5..427eba1 100644 --- a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml @@ -58,12 +58,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.user_name like concat('%', #{userName}, '%') and a.avatar_url = #{avatarUrl} and a.password = #{password} - and a.phone_number = #{phoneNumber} + and a.phone_number like concat('%', #{phoneNumber}, '%') and a.role_id = #{roleId} and a.is_store = #{isStore} and a.authed = #{authed} - and a.id_no = #{idNo} - and a.real_name = #{realName} + and a.id_no like concat('%', #{idNo}, '%') + and a.real_name like concat('%', #{realName}, '%') and a.nick_name like concat('%', #{nickName}, '%') and a.wechat_openid = #{wechatOpenid} and a.alipay_userid = #{alipayUserid} diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserReferralMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserReferralMapper.xml index 9fce947..53a9593 100644 --- a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserReferralMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserReferralMapper.xml @@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join zc_base_user c on a.referral_user_id = c.id and a.user_id = #{userId} - and a.user_phone_number = #{userPhoneNumber} + and a.user_phone_number like concat('%', #{userPhoneNumber}, '%') and a.referral_user_id = #{referralUserId} - and a.referral_user_phone_number = #{referralUserPhoneNumber} + and a.referral_user_phone_number like concat('%', #{referralUserPhoneNumber}, '%') and a.award_deadline = #{awardDeadline} and a.award_rate = #{awardRate} - and a.referral_order_no = #{referralOrderNo} + and a.referral_order_no like concat('%', #{referralOrderNo}, '%') diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml index 4731db5..15d414c 100644 --- a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.change_time = #{changeTime} and a.change_amount = #{changeAmount} and a.referral_order_no = #{referralOrderNo} - and s.name = #{userName} + and s.name like concat('%', #{userName}, '%') order by a.update_time desc diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletMapper.xml index c7a7976..a844574 100644 --- a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and user_name like concat('%', #{userName}, '%') - and phone_number = #{phoneNumber} + and phone_number like concat('%', #{phoneNumber}, '%') and balance = #{balance} and available_amount = #{availableAmount} and freeze_amount = #{freezeAmount} diff --git a/ruoyi-admin/src/main/resources/mapper/operation/CompanyMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/CompanyMapper.xml index e2b0ce1..786c9a1 100644 --- a/ruoyi-admin/src/main/resources/mapper/operation/CompanyMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/operation/CompanyMapper.xml @@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and id = #{id} and company_name like concat('%', #{companyName}, '%') and contact_name like concat('%', #{contactName}, '%') - and phone = #{phone} + and phone like concat('%', #{phone}, '%') and address = #{address} and balance = #{balance} and deposit = #{deposit} diff --git a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml index c03e61b..7f225be 100644 --- a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml @@ -71,8 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cs.del_flag = '0' and c.del_flag = '0' and cs.name like concat('%', #{name}, '%') - and cs.contact_person = #{contactPerson} - and cs.phone = #{phone} + and cs.contact_person like concat('%', #{contactPerson}, '%') + and cs.phone like concat('%', #{phone}, '%') and cs.province_id = #{provinceId} and cs.province_name like concat('%', #{provinceName}, '%') and cs.city_id = #{cityId} @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cs.operating_nature = #{operatingNature} and cs.introduction = #{introduction} and cs.bank_account = #{bankAccount} - and cs.store_number = #{storeNumber} + and cs.store_number like concat('%', #{storeNumber}, '%') and cs.business_license_img = #{businessLicenseImg} and cs.audit_status = #{auditStatus} and cs.audit_time = #{auditTime} diff --git a/ruoyi-admin/src/main/resources/mapper/operation/ZcCarDamageMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/ZcCarDamageMapper.xml index 16e5a6e..f977687 100644 --- a/ruoyi-admin/src/main/resources/mapper/operation/ZcCarDamageMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/operation/ZcCarDamageMapper.xml @@ -63,7 +63,7 @@ and a.extend2 = #{extend2} and a.extend3 = #{extend3} and c.operator_id = #{operatorId} - and c.store_name = #{storeName} + and c.store_name like concat('%', #{storeName}, '%') and date_format(a.submit_time,'%y%m%d') >= date_format(#{beginSubmitTime},'%y%m%d') diff --git a/ruoyi-admin/src/main/resources/mapper/operation/ZcCarMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/ZcCarMapper.xml index 00bbc70..230057c 100644 --- a/ruoyi-admin/src/main/resources/mapper/operation/ZcCarMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/operation/ZcCarMapper.xml @@ -50,8 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderDistribMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderDistribMapper.xml index dfe1602..64029a2 100644 --- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderDistribMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderDistribMapper.xml @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.order_id = #{orderId} - and a.order_no = #{orderNo} + and a.order_no like concat('%', #{orderNo}, '%') and a.company_id = #{companyId} and a.referral_user_id = #{referralUserId} and a.distrib_type = #{distribType} @@ -98,8 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(b.first_order_time,'%y%m%d') <= date_format(#{params.endFirstOrderTime},'%y%m%d') - and s.name = #{zcOrderMain.storeName} - and zc.license_plate = #{zcOrderMain.licensePlate} + and s.name like concat('%', #{zcOrderMain.storeName}, '%') + and zc.license_plate like concat('%', #{zcOrderMain.licensePlate}, '%') order by b.first_order_time desc diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml index 72dfe06..95298d2 100644 --- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml @@ -99,14 +99,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join zc_company_store s on s.id = a.store_id left join zc_car zc on zc.id = a.vehicle_id - and a.order_no = #{orderNo} + and a.order_no like concat('%', #{orderNo}, '%') and a.order_status = #{orderStatus} and a.operator_id = #{operatorId} and a.store_id = #{storeId} and a.vehicle_id = #{vehicleId} and a.customer_id = #{customerId} and a.customer_name like concat('%', #{customerName}, '%') - and a.customer_phone = #{customerPhone} + and a.customer_phone like concat('%', #{customerPhone}, '%') and a.rental_type = #{rentalType} and a.rental_days = #{rentalDays} and a.rental_price = #{rentalPrice} @@ -121,8 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.rent_car_rule_id = #{rentCarRuleId} and a.rent_battey_rule_id = #{rentBatteyRuleId} - and s.name = #{storeName} - and zc.license_plate = #{licensePlate} + and s.name like concat('%', #{storeName}, '%') + and zc.license_plate like concat('%', #{licensePlate}, '%') and date_format(a.first_order_time,'%y%m%d') >= date_format(#{params.beginFirstOrderTime},'%y%m%d') diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml index 72d17d9..00b96d7 100644 --- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml @@ -31,11 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and order_id = #{orderId} - and suborder_no = #{suborderNo} + and suborder_no like concat('%', #{suborderNo}, '%') and suborder_type = #{suborderType} and amount = #{amount} and payment_method = #{paymentMethod} - and vin_battery_no = #{vinBatteryNo} + and vin_battery_no like concat('%', #{vinBatteryNo}, '%') and created_at = #{createdAt} and payment_id = #{paymentId} and paid_at = #{paidAt}