From 96adeade605ec5b8c9d7a27a30e7afc92a386886 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 19 Mar 2025 17:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/lease/service/impl/MaLeaseInfoServiceImpl.java | 6 +++--- .../main/resources/mapper/material/device/DevInfoMapper.xml | 1 + .../resources/mapper/material/lease/MaLeaseInfoMapper.xml | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java index 10f7303..b90b6cc 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java @@ -121,9 +121,9 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { phoneNumber = Sm4Utils.decrypt(info.getPhoneNumber()); } // 根据电话号码数量发送短信 - //JSONObject sendResult = SmsTool.sendSms(new SmsParam(phoneNumber, notice.getNoticeContent()), BmConfigItems.ANHUI_COMPANY_SMS_KEY); - String sendResult = SmsUtils.smsToken(phoneNumber, maLeaseInfo.getLeaseName(), ""); - if (StringUtils.isBlank(sendResult)) { + JSONObject sendResult = SmsTool.sendSms(new SmsParam(phoneNumber, notice.getNoticeContent()), BmConfigItems.ANHUI_COMPANY_SMS_KEY); + //String sendResult = SmsUtils.smsToken(phoneNumber, maLeaseInfo.getLeaseName(), ""); + if (StringUtils.isBlank(sendResult.toString())) { return AjaxResult.error("短信发送失败"); } else { System.out.println("短信发送成功:" + sendResult); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 326f1c7..40bfbec 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -996,6 +996,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sum(total_lease_day) as totalLeaseDay FROM ma_dev_info + where is_active = '1' diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml index c3dceca..05889a3 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml @@ -628,7 +628,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mt.`level` = '4' LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.`level` = '3' - WHERE 1 =1 + WHERE + md.is_active = '1' and mt1.type_name like concat('%', #{keyWord}, '%') or md.device_name like concat('%', #{keyWord}, '%') or