From 6b85c5f4cc40768567ed9ed73b163adbb3bfedca Mon Sep 17 00:00:00 2001 From: gaowdong Date: Wed, 26 Mar 2025 15:07:20 +0800 Subject: [PATCH] 5415 --- .../v3/mapper/AccExceptionRecordMapper.xml | 4 +-- .../mapper/account/AccDrawAuditMapper.xml | 4 +-- .../account/AccOperationRecordMapper.xml | 4 +-- .../mapper/account/AccRepairErrorMapper.xml | 4 +-- .../account/AccSubHandReceiveMapper.xml | 4 +-- .../account/AccTradeCashErrorMapper.xml | 4 +-- .../account/AccTradeRepealErrorMapper.xml | 4 +-- .../account/ReportAccountConsumeMapper.xml | 12 ++++---- .../ReportAccountWalletConsumeMapper.xml | 8 +++--- .../mapper/customer/CustAccTempMapper.xml | 12 ++++---- .../mapper/customer/CustInfoMapper.xml | 4 +-- .../mapper/drp/DrpWarehouseMapper.xml | 2 +- .../nutrition/HealthBodyRecordMapper.xml | 4 +-- .../mapper/order/OrdAppInfoMapper.xml | 4 +-- .../mapper/order/OrderInfoMapper.xml | 28 +++++++++---------- .../mapper/order/OrderPreBookMapper.xml | 2 +- .../mapper/report/ReportAccountFlowMapper.xml | 4 +-- .../resources/mapper/v3/AccInfoMapper.xml | 4 +-- .../resources/mapper/v3/AccTradeMapper.xml | 4 +-- 19 files changed, 58 insertions(+), 58 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml index af0c11c7..81e710ab 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml @@ -87,10 +87,10 @@ and (t2.cust_num LIKE CONCAT('%', #{param.keyword},'%') - or t2.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or t2.nick_name = #{param.keyword} or t2.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or t2.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or t2.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccDrawAuditMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccDrawAuditMapper.xml index 4bb8b106..6174d0ec 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccDrawAuditMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccDrawAuditMapper.xml @@ -316,10 +316,10 @@ and (ci.cust_num LIKE CONCAT('%', #{param.keyword},'%') - or ci.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or ci.nick_name = #{param.keyword} or ci.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or ci.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or ci.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationRecordMapper.xml index 9f55c30a..21b83832 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationRecordMapper.xml @@ -35,9 +35,9 @@ and (t2.cust_num LIKE CONCAT('%', #{content.keyword},'%') - or t2.nick_name = #{content.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or t2.nick_name = #{content.keyword} or t2.phonenumber = #{content.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or t2.nick_name_like LIKE CONCAT('%',#{content.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or t2.nick_name_like LIKE CONCAT('%',#{content.keyword},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccRepairErrorMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccRepairErrorMapper.xml index 7497ca3c..e0af4c10 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccRepairErrorMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccRepairErrorMapper.xml @@ -52,10 +52,10 @@ and (ci.cust_num LIKE CONCAT('%', #{param.keyword},'%') - or ci.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or ci.nick_name = #{param.keyword} or ci.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or ci.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or ci.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccSubHandReceiveMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccSubHandReceiveMapper.xml index b2ebdd4a..18afbfe7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccSubHandReceiveMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccSubHandReceiveMapper.xml @@ -62,10 +62,10 @@ and (t2.cust_num LIKE CONCAT('%', #{param.keyword},'%') - or t2.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or t2.nick_name = #{param.keyword} or t2.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or t2.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or t2.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeCashErrorMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeCashErrorMapper.xml index f443cd8b..497a7d29 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeCashErrorMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeCashErrorMapper.xml @@ -21,10 +21,10 @@ and (b.cust_num LIKE CONCAT('%', #{param.keyword},'%') - or b.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or b.nick_name = #{param.keyword} or b.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or b.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or b.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeRepealErrorMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeRepealErrorMapper.xml index e70514e3..529a1c55 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeRepealErrorMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeRepealErrorMapper.xml @@ -75,10 +75,10 @@ and (ci.cust_num LIKE CONCAT('%', #{param.keyword},'%') - or ci.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or ci.nick_name = #{param.keyword} or ci.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or ci.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or ci.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountConsumeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountConsumeMapper.xml index 4700f446..9a4451f6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountConsumeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountConsumeMapper.xml @@ -46,8 +46,8 @@ AND ( - ci.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.keyword} + OR ci.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') OR ci.cust_num = #{param.keyword} OR ci.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} @@ -134,8 +134,8 @@ AND ( - ci.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.keyword} + OR ci.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') OR ci.cust_num = #{param.keyword} OR ci.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} @@ -292,8 +292,8 @@ AND ( - c.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR c.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + c.nick_name = #{param.keyword} + OR c.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') OR c.cust_num = #{param.keyword} OR c.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountWalletConsumeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountWalletConsumeMapper.xml index 8bd9601e..b66918e0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountWalletConsumeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountWalletConsumeMapper.xml @@ -112,8 +112,8 @@ t.total_amount != 0 AND ( - c.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR c.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + c.nick_name = #{param.keyword} + OR c.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') OR c.cust_num = #{param.keyword} OR c.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} @@ -170,8 +170,8 @@ a.statistic_date BETWEEN #{param.startDate} AND #{param.endDate} AND ( - c.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR c.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + c.nick_name = #{param.keyword} + OR c.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') OR c.cust_num = #{param.keyword} OR c.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustAccTempMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustAccTempMapper.xml index cfe008ff..d64505eb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustAccTempMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustAccTempMapper.xml @@ -69,13 +69,13 @@ and t1.cust_id = #{custAccQueryTempDto.custId,jdbcType=BIGINT} - and t1.mobile = #{custAccQueryTempDto.mobile,jdbcType=VARCHAR, typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + and t1.mobile = #{custAccQueryTempDto.mobile,jdbcType=VARCHAR} - and t1.cust_name = #{custAccQueryTempDto.custName,jdbcType=VARCHAR, typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + and t1.cust_name = #{custAccQueryTempDto.custName,jdbcType=VARCHAR} - and t1.id_card = #{custAccQueryTempDto.idCard,jdbcType=VARCHAR, typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + and t1.id_card = #{custAccQueryTempDto.idCard,jdbcType=VARCHAR} and t1.org_id = #{custAccQueryTempDto.orgId,jdbcType=BIGINT} @@ -180,16 +180,16 @@ and A.cust_third_id = #{machineAccountInfoV3DTO.custThirdId} - and A.id_card = #{machineAccountInfoV3DTO.idCard,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + and A.id_card = #{machineAccountInfoV3DTO.idCard} - and A.mobile = #{machineAccountInfoV3DTO.mobile,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + and A.mobile = #{machineAccountInfoV3DTO.mobile} and A.cust_num = #{machineAccountInfoV3DTO.custNum} - and A.cust_name = #{machineAccountInfoV3DTO.custName,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + and A.cust_name = #{machineAccountInfoV3DTO.custName} and B.serial_num = #{machineAccountInfoV3DTO.serialNum} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml index b703146c..05e6a5be 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml @@ -500,8 +500,8 @@ t1.status = 0 and (t1.cust_num LIKE CONCAT('%', #{param.keyword},'%') - or t1.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or t1.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or t1.nick_name = #{param.keyword} + or t1.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') or t1.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/drp/DrpWarehouseMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/drp/DrpWarehouseMapper.xml index 0c9eed34..e100b1bb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/drp/DrpWarehouseMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/drp/DrpWarehouseMapper.xml @@ -48,7 +48,7 @@ and dw.warehouse_type like #{content.warehouseType} - and mu.nick_name = #{content.realName,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + and mu.nick_name = #{content.realName} and dw.status = #{content.status} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml index c1d1bc0a..800b6ccc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml @@ -35,7 +35,7 @@ AND ( c.cust_num = #{param.keyword} - OR c.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + OR c.nick_name = #{param.keyword} OR c.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} ) @@ -87,7 +87,7 @@ AND ( c.cust_num = #{param.keyword} - OR c.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + OR c.nick_name = #{param.keyword} OR c.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml index ad30a44d..b071157b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml @@ -137,8 +137,8 @@ and ( - ci.nick_name = #{ordParam.keywords,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.cust_num = #{ordParam.keywords,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + ci.nick_name = #{ordParam.keywords} + OR ci.cust_num = #{ordParam.keywords} OR ci.phonenumber = #{ordParam.keywords,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml index 94e79516..e1f858e5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -250,8 +250,8 @@ SELECT 1 FROM sys_user ci WHERE oi.cust_id = ci.cust_id AND ( - ci.nick_name = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.custSearchInfo} + OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo},'%') OR ci.cust_num = #{param.custSearchInfo} OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} @@ -271,8 +271,8 @@ SELECT 1 FROM sys_user ci WHERE oi.cust_id = ci.cust_id AND ( - ci.nick_name = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.buffetSearchInfo} + OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo},'%') OR ci.cust_num = #{param.buffetSearchInfo} OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} @@ -311,8 +311,8 @@ SELECT 1 FROM sys_user ci WHERE oi.cust_id = ci.cust_id AND ( - ci.nick_name = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.buffetSearchInfo} + OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo},'%') OR ci.cust_num = #{param.buffetSearchInfo} OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} @@ -326,8 +326,8 @@ SELECT 1 FROM sys_user ci WHERE oi.cust_id = ci.cust_id AND ( - ci.nick_name = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.buffetSearchInfo} + OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo},'%') OR ci.cust_num = #{param.buffetSearchInfo} OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} @@ -537,8 +537,8 @@ WHERE oi.cust_id = ci.cust_id AND ( - ci.nick_name = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.custSearchInfo} + OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo},'%') OR ci.cust_num = #{param.custSearchInfo} OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} @@ -613,8 +613,8 @@ WHERE oi.cust_id = ci.cust_id AND ( - ci.nick_name = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.custSearchInfo} + OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo},'%') OR ci.cust_num = #{param.custSearchInfo} OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} @@ -628,8 +628,8 @@ SELECT 1 FROM sys_user ci WHERE oi.cust_id = ci.cust_id AND ( - ci.nick_name = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.buffetSearchInfo} + OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo},'%') OR ci.cust_num = #{param.buffetSearchInfo} OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderPreBookMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderPreBookMapper.xml index 8988a84b..cec5e8bd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderPreBookMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderPreBookMapper.xml @@ -33,7 +33,7 @@ AND ( ci.cust_num = #{param.custSearchInfo} - OR ci.nick_name = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + OR ci.nick_name = #{param.custSearchInfo} OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAccountFlowMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAccountFlowMapper.xml index 380815d1..794942ac 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAccountFlowMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAccountFlowMapper.xml @@ -296,8 +296,8 @@ SELECT 1 FROM sys_user ci WHERE a.cust_id = ci.cust_id AND ( - ci.nick_name = #{param.keywords,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - OR ci.nick_name_like LIKE CONCAT('%',#{param.keywords,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + ci.nick_name = #{param.keywords} + OR ci.nick_name_like LIKE CONCAT('%',#{param.keywords},'%') OR ci.cust_num = #{param.keywords} OR ci.phonenumber = #{param.keywords,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml index afd819f1..94853eed 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml @@ -688,10 +688,10 @@ and (t2.cust_num LIKE CONCAT('%', #{infoParam.keyword},'%') - or t2.nick_name = #{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or t2.nick_name = #{infoParam.keyword} or t2.phonenumber = #{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or t2.nick_name_like LIKE CONCAT('%',#{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or t2.nick_name_like LIKE CONCAT('%',#{infoParam.keyword},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml index 070644e9..7d9eb321 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml @@ -259,10 +259,10 @@ and (ci.cust_num LIKE CONCAT('%', #{param.keyword},'%') - or ci.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or ci.nick_name = #{param.keyword} or ci.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} - or ci.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') + or ci.nick_name_like LIKE CONCAT('%',#{param.keyword},'%') )