From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro

---
 src/main/resources/mapper/approve/ApprovalTemplateMapper.xml |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/approve/ApprovalTemplateMapper.xml b/src/main/resources/mapper/approve/ApprovalTemplateMapper.xml
new file mode 100644
index 0000000..a48432b
--- /dev/null
+++ b/src/main/resources/mapper/approve/ApprovalTemplateMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.approve.mapper.ApprovalTemplateMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApprovalTemplate">
+        <id column="id" property="id" />
+        <result column="template_name" property="templateName" />
+        <result column="enabled" property="enabled" />
+        <result column="description" property="description" />
+        <result column="deleted" property="deleted" />
+        <result column="dept_id" property="deptId" />
+    </resultMap>
+    <select id="listPage" resultType="com.ruoyi.approve.bean.vo.ApprovalTemplateVo">
+        select at.*,su.nick_name as create_user_name  from
+        approval_template at
+        left join sys_user su on at.create_user = su.user_id
+        <where>
+            deleted = 0
+            <if test="ew.templateName != null">
+                and template_name like concat('%',#{ew.templateName},'%')
+            </if>
+            <if test="ew.templateType != null">
+                and template_type = #{ew.templateType}
+            </if>
+            <if test="ew.enabled != null">
+                and enabled = #{ew.enabled}
+            </if>
+        </where>
+        order by at.id desc
+    </select>
+
+</mapper>

--
Gitblit v1.9.3