hbwri/skjcmanager.git

			@@ -1,12 +1,19 @@
			package cn.gistack.alerts.sms.service.impl;

			import cn.gistack.alerts.alarmRule.entity.AlarmRule;
			import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
			import cn.gistack.alerts.sms.entity.SmsResult;
			import cn.gistack.alerts.sms.mapper.SmsResultMapper;
			import cn.gistack.alerts.sms.service.ISmsResultService;
			import cn.gistack.alerts.sms.vo.SmsResultVO;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import org.apache.ibatis.jdbc.Null;
			import org.springblade.core.mp.base.BaseServiceImpl;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.List;

			/**
			* 短信发送结果
			@@ -14,6 +21,9 @@
			*/
			@Service
			public class SmsResultServiceImpl extends BaseServiceImpl<SmsResultMapper, SmsResult> implements ISmsResultService {

			@Autowired
			private AlarmRuleService alarmRuleService;

			/**
			* 自定义分页列表查询
			@@ -23,11 +33,19 @@
			*/
			@Override
			public Object selectSmsResultPage(IPage<SmsResultVO> page, SmsResultVO smsResult) {
			List<String> list = new ArrayList<>();
			// 判断是否为一级目录
			if (null!=smsResult.getSmsType() && smsResult.getSmsType().length()>1){
			// 查询对应的短信模板ID 集合
			list = alarmRuleService.getAlarmRuleDetailList(smsResult.getSmsType());
			// 设置类型为null
			smsResult.setSmsType("");
			}
			if (null!=smsResult.getIsExport()){
			// 导出，不分页
			return baseMapper.selectSmsResultPage(null,smsResult);
			return baseMapper.selectSmsResultPage(null,smsResult,list);
			}
			// 查询返回
			return page.setRecords(baseMapper.selectSmsResultPage(page,smsResult));
			return page.setRecords(baseMapper.selectSmsResultPage(page,smsResult,list));
			}
			}