diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcOperatorMapper.xml
index 912fc288..7e0568e3 100644
--- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcOperatorMapper.xml
+++ b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcOperatorMapper.xml
@@ -304,13 +304,13 @@
LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute
where xo.del_flag = 0
- and xo.name like concat(concat('%', #{name}), '%')
+ and xo.name like concat('%', #{name}, '%')
- and xo.contact_name like concat(concat('%', #{contactName}), '%')
+ and xo.contact_name like concat('%', #{contactName}, '%')
- and xo.contact_phone like concat(concat('%', #{contactPhone}), '%')
+ and xo.contact_phone like concat('%', #{contactPhone}, '%')
AND xo.create_time >= #{createTimeStart}
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
index 6ded72cf..369d4cb5 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -670,6 +670,17 @@
left join et_dispute_orders as ed on ed.start_charge_seq = ho.internet_serial_number and ed.dispute_order_status !=2
left join xhpc_internet_user as inu on inu.internet_user_id = ho.user_id and ho.internet_serial_number is not null
left join xhpc_app_user as apu on apu.app_user_id = ho.user_id and ho.internet_serial_number is null
+
+ inner join (
+ select xiu.internet_user_id as user_id from xhpc_internet_user as xiu inner join(select user_id from xhpc_history_order where source=1) us1 on us1.user_id = xiu.internet_user_id where xiu.phone like concat('%', #{phone}, '%')
+ union
+ select xau.app_user_id as user_id from xhpc_app_user as xau inner join(select user_id from xhpc_history_order where source=0) us2 on us2.user_id = xau.app_user_id where xau.phone like concat('%', #{phone}, '%')
+ union
+ select xcp.community_personnel_id as user_id from xhpc_community_personnel as xcp inner join(select user_id from xhpc_history_order where source=2) us3.user_id = xcp.community_personnel_id where xcp.account like concat('%', #{phone}, '%')
+ union
+ select xcup.customers_personnel_id as user_id from xhpc_customers_personnel as xcup inner join(select user_id from xhpc_history_order where source=3) us4.user_id = xcup.customers_personnel_id where xcup.account like concat('%', #{phone}, '%')
+ ) ut on ut.app_user_id = ho.user_id
+
where ho.status =0 and ho.del_flag=0
and ho.type=#{type}
@@ -716,17 +727,7 @@
and op.operator_id =#{operatorId}
-
- and ho.user_id in(
- select internet_user_id as user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%') and internet_user_id in (select user_id from xhpc_history_order where source=1)
- union
- select app_user_id as user_id from xhpc_app_user where phone like concat('%', #{phone}, '%') and app_user_id in (select user_id from xhpc_history_order where source=0)
- union
- select community_personnel_id as user_id from xhpc_community_personnel where account like concat('%', #{phone}, '%') and community_personnel_id in (select user_id from xhpc_history_order where source=2)
- union
- select customers_personnel_id as user_id from xhpc_customers_personnel where account like concat('%', #{phone}, '%') and customers_personnel_id in (select user_id from xhpc_history_order where source=3)
- )
-
+
and ho.user_id in(select app_user_id from xhpc_app_user where app_user_id in (select user_id from xhpc_history_order where source=0))
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml
index d5829f79..0c233aff 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml
@@ -137,7 +137,7 @@
and xho.user_id = #{userId}
- and xho.serial_number like concat(concat('%', #{serialNumber}), '%')
+ and xho.serial_number like concat('%', #{serialNumber}, '%')
AND xco.create_time >= #{createTimeStart}
@@ -146,7 +146,7 @@
AND xco.create_time <= #{createTimeEnd}
- and xcs.`name`like concat(concat('%', #{chargingStationName}), '%')
+ and xcs.`name`like concat('%', #{chargingStationName}, '%')
and xho.reconciliation_status = #{status}
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml
index f3273ce7..215a0ea5 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml
@@ -165,7 +165,7 @@
and su.user_id = #{userId}
- and xho.serial_number like concat(concat('%', #{serialNumber}), '%')
+ and xho.serial_number like concat('%', #{serialNumber}, '%')
AND xco.create_time >= #{createTimeStart}
@@ -174,7 +174,7 @@
AND xco.create_time <= #{createTimeEnd}
- and xcs.`name`like concat(concat('%', #{chargingStationName}), '%')
+ and xcs.`name`like concat('%', #{chargingStationName}, '%')
and xho.sorting_status = #{status}
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
index f439fd61..bfa462e5 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
@@ -410,17 +410,16 @@
left join xhpc_internet_user as inu on inu.internet_user_id = co.user_id and co.source =1
left join xhpc_app_user as apu on apu.app_user_id = co.user_id and co.source =0
LEFT JOIN (
- SELECT
- charging_order_id,
- real_time_order_id,
- soc,
- charging_degree,
- charging_time
- FROM
- xhpc_real_time_order
- WHERE
- real_time_order_id IN ( SELECT max( real_time_order_id ) FROM xhpc_real_time_order GROUP BY charging_order_id )
+ SELECT charging_order_id,real_time_order_id,soc,charging_degree,charging_time FROM xhpc_real_time_order
+ WHERE real_time_order_id IN ( SELECT max( real_time_order_id ) FROM xhpc_real_time_order GROUP BY charging_order_id )
) ro ON ro.charging_order_id = co.charge_order_id
+
+ inner join (
+ SELECT cro.user_id user_id FROM xhpc_charge_order cro inner join(SELECT app_user_id FROM xhpc_app_user where phone like concat('%', #{phone}, '%')) us1 on us1.app_user_id = cro.user_id where xco.source = 0
+ union
+ SELECT cro.user_id user_id FROM xhpc_charge_order xco inner join(SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%')) us2 on us2.internet_user_id = xco.user_id where xco.source = 1
+ ) ut on ut.app_user_id = xro.user_id
+
where co.status=#{status} and co.del_flag=0
and co.source =1
@@ -454,14 +453,6 @@
and op.operator_id =#{operatorId}
-
- and co.user_id in (
- SELECT cro.user_id
- FROM xhpc_charge_order cro WHERE cro.source = 0 AND cro.user_id IN ( SELECT app_user_id FROM xhpc_app_user where phone like concat('%', #{phone}, '%'))
- union
- SELECT cro.user_id FROM xhpc_charge_order cro WHERE cro.source = 1 AND cro.user_id IN (SELECT internet_user_id from xhpc_internet_user where phone like concat('%', #{phone}, '%'))
- )
-
and co.user_id in (
diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java
index 55240683..ab222019 100644
--- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java
+++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java
@@ -372,6 +372,8 @@ public class XhpcRefundAuditController extends BaseController {
" " + partner_trade_no + "\n" +
" " + sign + "\n" +
" ";
+
+ logger.info("++++++++++++xmlString++++++++++++++++"+xmlString);
return xmlString;
}
@@ -392,7 +394,7 @@ public class XhpcRefundAuditController extends BaseController {
refundOrder.setStatus(2);
refundOrder.setRemark(map.get("err_code_des").toString());
updateXhpcRefundOrder(refundOrder,amountRefundOrder,userId,phone,2);
- logger.info("++++++++++++审核失败原因++++++++++++++++"+map.get("err_code_des").toString());
+ logger.info("++++++++++++审核失败原因++++++++++++++++"+map.get("err_code_des").toString()+"错误代码："+map.get("err_code").toString());
return AjaxResult.error(map.get("err_code_des"));
} else {
//退款成功修改订单
@@ -595,6 +597,7 @@ public class XhpcRefundAuditController extends BaseController {
if(type ==1){
xhpcUserAccountStatementService.add(refundOrder.getRefundOrderId(), amount, userId, StatusConstants.FLOWING_WATER_REFUND);
}else{
+
xhpcUserAccountStatementService.add(refundOrder.getRefundOrderId(), amount, userId, StatusConstants.FLOWING_WATER_REFUND_ERROE);
try{
//发送短信
@@ -635,4 +638,17 @@ public class XhpcRefundAuditController extends BaseController {
}
}
+
+ @GetMapping("/text")
+ public void text(){
+ try{
+ //发送短信
+ HashMap paramMap = new HashMap<>();
+ paramMap.put("phone", "18123374652");
+ paramMap.put("content", "【小华充电】退款-尊敬的用户，当前退款人数较多，申请退款失败，请您重新提交申请！");
+ smsService.sendNotice(paramMap);
+ }catch (Exception e){
+ System.out.println("发送失败");
+ }
+ }
}
diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
index 944866ad..0702afed 100644
--- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
+++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
@@ -159,36 +159,37 @@
LEFT JOIN xhpc_community_personnel cop on cop.community_personnel_id = xro.user_id and xro.source =2
LEFT JOIN xhpc_customers_personnel cup on cup.customers_personnel_id = xro.user_id and xro.source =3
LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'recharge_order_status' and sdd.dict_value = xro.`status`
+
+ inner join (
+ select xau.app_user_id from xhpc_app_user as xau inner join (select user_id from xhpc_recharge_order where source=0) us1 on us1.user_id=xau.app_user_id where xau.phone like concat('%', #{phone}, '%')
+ union
+ select xcop.community_personnel_id as app_user_id from xhpc_community_personnel as xcop inner join (select user_id from xhpc_recharge_order where source=2) us2 on us2.user_id=xcop.community_personnel_id where xcop.phone like concat('%', #{phone}, '%')
+ union
+ select xcup.customers_personnel_id as app_user_id from xhpc_customers_personnel as xcup inner join (select user_id from xhpc_recharge_order where source=3) us3 on us3.user_id = xcup.customers_personnel_id where xcup.phone like concat('%', #{phone}, '%')
+ ) ut on ut.app_user_id = xro.user_id
+
where xro.del_flag = 0
-
+
- and xro.source=#{source} and xau.phone like concat(concat('%', #{phone}), '%')
+ and xro.source=#{source} and xau.phone like concat('%', #{phone}, '%')
- and xro.source=#{source} and cop.account like concat(concat('%', #{phone}), '%')
+ and xro.source=#{source} and cop.account like concat('%', #{phone}, '%')
- and xro.source=#{source} and cup.account like concat(concat('%', #{phone}), '%')
+ and xro.source=#{source} and cup.account like concat('%', #{phone}, '%')
-
+
and xro.source=#{source}
-
- and xau.app_user_id in (
- select app_user_id from xhpc_app_user where phone like concat(concat('%', #{phone}), '%') and app_user_id in (select user_id from xhpc_recharge_order where source=0)
- union
- select community_personnel_id as app_user_id from xhpc_community_personnel where account like concat(concat('%', #{phone}), '%') and community_personnel_id in (select user_id from xhpc_recharge_order where source=2)
- union
- select customers_personnel_id from xhpc_customers_personnel where account like concat(concat('%', #{phone}), '%') and community_personnel_id in (select user_id from xhpc_recharge_order where source=3)
- )
-
+
- and xro.recharge_order_number like concat(concat('%', #{rechargeOrderNumber}), '%')
+ and xro.recharge_order_number like concat('%', #{rechargeOrderNumber}, '%')
- and xro.status like concat(concat('%', #{status}), '%')
+ and xro.status like concat('%', #{status}, '%')
AND xro.create_time >= #{createTimeStart}
@@ -212,13 +213,13 @@
LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'recharge_order_status' and sdd.dict_value = xro.`status`
where xro.del_flag = 0
- and xau.phone like concat(concat('%', #{phone}), '%')
+ and xau.phone like concat('%', #{phone}, '%')
- and xro.recharge_order_number like concat(concat('%', #{rechargeOrderNumber}), '%')
+ and xro.recharge_order_number like concat('%', #{rechargeOrderNumber}, '%')
- and xro.status like concat(concat('%', #{status}), '%')
+ and xro.status like concat('%', #{status}, '%')
AND xro.create_time >= #{createTimeStart}
diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml
index b0477b5b..221dabf9 100644
--- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml
+++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml
@@ -194,40 +194,35 @@
LEFT JOIN xhpc_customers_personnel cup on cup.customers_personnel_id = xro.user_id and xro.source =3
LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'refund_order_status' and sdd.dict_value = xro.`status`
LEFT JOIN sys_dict_data sdds on sdds.`dict_type` = 'refund_examine_status' and sdds.dict_value =xro.examine_status
+
+ inner join (
+ select xau.app_user_id from xhpc_app_user as xau inner join(select user_id from xhpc_recharge_order where source=0) us1 on us1.user_id = xau.app_user_id where xau.phone like concat('%', #{phone}, '%')
+ union
+ select xcop.community_personnel_id as app_user_id from xhpc_community_personnel as xcop inner join (select user_id from xhpc_recharge_order where source=2) us2 on us2.user_id=xcop.community_personnel_id where xcop.phone like concat('%', #{phone}, '%')
+ union
+ select xcup.customers_personnel_id as app_user_id from xhpc_customers_personnel as xcup inner join (select user_id from xhpc_recharge_order where source=3) us3 on us3.user_id = xcup.customers_personnel_id where xcup.phone like concat('%', #{phone}, '%')
+ ) ut on ut.app_user_id = xro.app_user_id
+
where xro.del_flag = 0
- and xro.source=#{source} and xau.phone like concat(concat('%', #{phone}), '%')
+ and xro.source=#{source} and xau.phone like concat('%', #{phone}, '%')
- and xro.source=#{source} and cop.account like concat(concat('%', #{phone}), '%')
+ and xro.source=#{source} and cop.account like concat('%', #{phone}, '%')
- and xro.source=#{source} and cup.account like concat(concat('%', #{phone}), '%')
+ and xro.source=#{source} and cup.account like concat('%', #{phone}, '%')
-
+
and xro.source=#{source}
-
- and xau.app_user_id in (
- select app_user_id from xhpc_app_user where phone like concat(concat('%', #{phone}), '%') and app_user_id in
- (select user_id from xhpc_recharge_order where source=0)
- union
- select community_personnel_id as app_user_id from xhpc_community_personnel where account like
- concat(concat('%', #{phone}), '%') and community_personnel_id in (select user_id from xhpc_recharge_order
- where source=2)
- union
- select customers_personnel_id as app_user_id from xhpc_customers_personnel where account like
- concat(concat('%', #{phone}), '%') and community_personnel_id in (select user_id from xhpc_recharge_order
- where source=3)
- )
-
- and xro.refund_order_number like concat(concat('%', #{refundOrderNumber}), '%')
+ and xro.refund_order_number like concat('%', #{refundOrderNumber}, '%')
- and xro.status like concat(concat('%', #{status}), '%')
+ and xro.status like concat('%', #{status}, '%')
AND xro.create_time >= #{createTimeStart}
@@ -250,13 +245,13 @@
xro.examine_status
where xro.del_flag = 0
- and xau.phone like concat(concat('%', #{phone}), '%')
+ and xau.phone like concat('%', #{phone}, '%')
- and xro.refund_order_number like concat(concat('%', #{refundOrderNumber}), '%')
+ and xro.refund_order_number like concat('%', #{refundOrderNumber}, '%')
- and xro.status like concat(concat('%', #{status}), '%')
+ and xro.status like concat('%', #{status}, '%')
AND xro.create_time >= #{createTimeStart}
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
index 83e4c659..aa8bd560 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
@@ -192,7 +192,7 @@
xau.app_user_id
WHERE xau.del_flag = 0
- and xau.phone like concat(concat('%', #{phone}), '%')
+ and xau.phone like concat('%', #{phone}, '%')
ORDER BY xau.create_time DESC
@@ -203,7 +203,7 @@
(select count(DISTINCT user_id) from xhpc_charge_order where create_time >= #{time}) userVitality
from xhpc_app_user xau
- and xau.phone like concat(concat('%', #{phone}), '%')
+ and xau.phone like concat('%', #{phone}, '%')
ORDER BY xau.create_time DESC
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml
index 42265840..c045714a 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml
@@ -210,10 +210,10 @@
xhpc_community_personnel
where community_id=#{communityId} and del_flag=0
- and account like concat(concat('%', #{account}), '%')
+ and account like concat('%', #{account), '%')
- and phone like concat(concat('%', #{phone}), '%')
+ and phone like concat('%', #{phone}, '%')
and status=#{status}
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml
index 148a2c3c..07cabce0 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml
@@ -204,10 +204,10 @@
xhpc_customers_personnel
where customers_id=#{customersId} and del_flag=0
- and account like concat(concat('%', #{account}), '%')
+ and account like concat('%', #{account}, '%')
- and phone like concat(concat('%', #{phone}), '%')
+ and phone like concat('%', #{phone}, '%')
and status=#{status}
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
index 1345de12..1408e126 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
@@ -260,13 +260,13 @@
LEFT JOIN sys_user su on su.internet_user_id = xiu.internet_user_id
WHERE xiu.del_flag = 0
- and xiu.name like concat(concat('%', #{name}), '%')
+ and xiu.name like concat('%', #{name}, '%')
- and xiu.contact_name like concat(concat('%', #{contactName}), '%')
+ and xiu.contact_name like concat('%', #{contactName}, '%')
- and xiu.contact_phone like concat(concat('%', #{contactPhone}), '%')
+ and xiu.contact_phone like concat('%', #{contactPhone}, '%')
AND xiu.create_time >= #{createTimeStart}
@@ -318,7 +318,7 @@
LEFT JOIN sys_user su on su.internet_user_id = xiu.internet_user_id
WHERE xiu.del_flag = 0
- and xiu.name like concat(concat('%', #{name}), '%')
+ and xiu.name like concat('%', #{name}, '%')
ORDER BY xiu.update_time DESC
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
index a4c0219a..e3374cc9 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
@@ -299,13 +299,13 @@
LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute
where xo.del_flag = 0
- and xo.name like concat(concat('%', #{name}), '%')
+ and xo.name like concat('%', #{name}, '%')
- and xo.contact_name like concat(concat('%', #{contactName}), '%')
+ and xo.contact_name like concat('%', #{contactName}, '%')
- and xo.contact_phone like concat(concat('%', #{contactPhone}), '%')
+ and xo.contact_phone like concat('%', #{contactPhone}, '%')
AND xo.create_time >= #{createTimeStart}
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml
index d981d2fe..4e986c7b 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml
@@ -78,10 +78,10 @@
from sys_user
WHERE del_flag = 0 and user_type = '00'
- and user_name like concat(concat('%', #{userName}), '%')
+ and user_name like concat('%', #{userName}, '%')
- and nick_name like concat(concat('%', #{nickName}), '%')
+ and nick_name like concat('%', #{nickName}, '%')
ORDER BY update_time DESC
@@ -107,10 +107,10 @@
LEFT JOIN xhpc_operator xo on xo.operator_id = su.operator_id
WHERE su.del_flag = 0 and user_type = '03'
- and su.user_name like concat(concat('%', #{userName}), '%')
+ and su.user_name like concat('%', #{userName}, '%')
- and su.nick_name like concat(concat('%', #{nickName}), '%')
+ and su.nick_name like concat('%', #{nickName}, '%')
and su.operator_id = #{operatorId}