From 2cba0d00dc45998105129a0c26cb546282cd39a8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 05 六月 2024 13:44:23 +0800
Subject: [PATCH] 随访功能测试:模板、任务、定时发送、公众号发送,流程走通

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
index 60a4739..2506350 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
@@ -1,12 +1,14 @@
 package com.ruoyi.web.controller.smartor;
 
 import com.alibaba.fastjson2.JSON;
+import com.github.pagehelper.util.StringUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.config.PhoneUtils;
 import com.smartor.config.RabbitMqCallPhoneConfig;
@@ -55,7 +57,8 @@
     @PreAuthorize("@ss.hasPermi('smartor:template:list')")
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody IvrLibaTemplate ivrLibaTemplate) {
-        startPage();
+        //鍒嗛〉
+        PageUtils.startPageByPost(ivrLibaTemplate.getPageNum(), ivrLibaTemplate.getPageSize());
         List<IvrLibaTemplate> list = ivrLibaTemplateService.selectIvrLibaTemplateList(ivrLibaTemplate);
         return getDataTable(list);
     }
@@ -134,8 +137,8 @@
     @ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢")
     @PostMapping("/selectInfoByCondition")
     public AjaxResult selectInfoByCondition(@RequestBody IvrLibaTemplateVO ivrLibaTemplateVO) {
-        if (ObjectUtils.isEmpty(ivrLibaTemplateVO)) {
-            throw new BaseException("鏌ヨ妯℃澘璇︽儏鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
+        if (ivrLibaTemplateVO.getID() == null) {
+            return success();
         }
         return success(ivrLibaTemplateService.selectInfoByCondition(ivrLibaTemplateVO));
     }

--
Gitblit v1.9.3