diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsTemplateController.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsTemplateController.java
index 018a06e70..8a8653496 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsTemplateController.java
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsTemplateController.java
@@ -23,8 +23,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.SmsTemplateDTO;
 import com.elink.esua.epdc.excel.SmsTemplateExcel;
 import com.elink.esua.epdc.service.SmsTemplateService;
@@ -51,7 +51,8 @@ public class SmsTemplateController {
 
     @GetMapping("page")
     public Result<PageData<SmsTemplateDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<SmsTemplateDTO> page = smsTemplateService.page(params);
+        //PageData<SmsTemplateDTO> page = smsTemplateService.page(params);
+        PageData<SmsTemplateDTO> page = smsTemplateService.getSmsTemplatePage(params);
         return new Result<PageData<SmsTemplateDTO>>().ok(page);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/dao/SmsTemplateDao.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/dao/SmsTemplateDao.java
index a0efe0522..febe5d37a 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/dao/SmsTemplateDao.java
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/dao/SmsTemplateDao.java
@@ -22,6 +22,9 @@ import com.elink.esua.epdc.dto.SmsTemplateDTO;
 import com.elink.esua.epdc.entity.SmsTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *  
  *
@@ -41,5 +44,12 @@ public interface SmsTemplateDao extends BaseDao<SmsTemplateEntity> {
      * @since 2020/1/7 16:52
      */
     SmsTemplateDTO selectOneSmsTemplateInfoByType(String smsTemplateType);
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<SmsTemplateDTO> getPage(Map<String, Object> params);
 	
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/SmsTemplateService.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/SmsTemplateService.java
index 8f92366d8..969140985 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/SmsTemplateService.java
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/SmsTemplateService.java
@@ -45,6 +45,13 @@ public interface SmsTemplateService extends BaseService<SmsTemplateEntity> {
      */
     PageData<SmsTemplateDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<SmsTemplateDTO> getSmsTemplatePage(Map<String, Object> params);
+
     /**
      * 默认查询
      *
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java
index 0a8c94df2..29c2fca2f 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java
@@ -32,7 +32,6 @@ import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
 import com.elink.esua.epdc.entity.SmsLogEntity;
 import com.elink.esua.epdc.entity.SmsTemplateEntity;
 import com.elink.esua.epdc.exception.ModuleErrorCode;
-import com.elink.esua.epdc.redis.SmsTemplateRedis;
 import com.elink.esua.epdc.service.SmsLogService;
 import com.elink.esua.epdc.service.SmsTemplateService;
 import com.elink.esua.epdc.sms.AbstractSmsService;
@@ -68,6 +67,18 @@ public class SmsTemplateServiceImpl extends BaseServiceImpl<SmsTemplateDao, SmsT
         return getPageData(page, SmsTemplateDTO.class);
     }
 
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<SmsTemplateDTO> getSmsTemplatePage(Map<String, Object> params) {
+        IPage<SmsTemplateDTO> page = getPage(params);
+        List<SmsTemplateDTO> list = baseDao.getPage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<SmsTemplateDTO> list(Map<String, Object> params) {
         List<SmsTemplateEntity> entityList = baseDao.selectList(getWrapper(params));
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsTemplateDao.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsTemplateDao.xml
index 62ab1dbf4..e385d436e 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsTemplateDao.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsTemplateDao.xml
@@ -7,5 +7,31 @@
         SELECT * FROM epdc_sms_template WHERE DEL_FLAG = '0' AND ENABLE_FLAG = '1' AND TEMPLATE_TYPE = #{smsTemplateType}
     </select>
 
+    <select id="getPage" resultType="com.elink.esua.epdc.dto.SmsTemplateDTO">
+        select
+        sl.ID,
+        sl.TEMPLATE_TYPE,
+        sl.TEMPLATE_TYPE_NAME,
+        sl.SIGN_NAME,
+        sl.TEMPLATE,
+        sl.REMARK,
+        sl.ENABLE_FLAG,
+        sl.REVISION,
+        sl.CREATED_BY,
+        sl.CREATED_TIME,
+        sl.UPDATED_BY,
+        sl.UPDATED_TIME,
+        sl.DEL_FLAG
+        from epdc_sms_template sl
+        where sl.DEL_FLAG = '0'
+        <if test="id != null and id != ''">
+            and sl.ID like '%' #{id} '%'
+        </if>
+        <if test="templateTypeName != null and templateTypeName != ''">
+            and sl.TEMPLATE_TYPE_NAME like '%' #{templateTypeName} '%'
+        </if>
+        order by sl.CREATED_TIME desc
+    </select>
+
 
 </mapper>
\ No newline at end of file