From dc5e5c07549b493e21c11dc7929c32ea9fd732b0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:08:26 +0800
Subject: [PATCH] 协同办公系统模块优化
---
src/main/resources/mapper/approve/ApproveProcessMapper.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 995ae0c..cdbdaa1 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -20,20 +20,38 @@
<result property="tenantId" column="tenant_id" />
<result property="approveType" column="approve_type" />
<result property="approveRemark" column="approve_remark" />
+ <result property="businessId" column="business_id" />
+ <result property="businessNo" column="business_no" />
+ <result property="businessTitle" column="business_title" />
+ <result property="amount" column="amount" />
+ <result property="businessData" column="business_data" />
+ <result property="flowDefinitionId" column="flow_definition_id" />
</resultMap>
<sql id="Base_Column_List">
id,approve_id,approve_user,approve_dept_id,approve_dept_name,approve_user_ids,
approve_user_names,approve_reason,approve_time,approve_over_time,approve_status,
- approve_delete,tenant_id,approve_type,approve_remark
+ approve_delete,tenant_id,approve_type,approve_remark,business_id,business_no,
+ business_title,amount,business_data,flow_definition_id,create_time,update_time
</sql>
<select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">
select * from approve_process where approve_delete = 0
<if test="req.approveId != null and req.approveId != ''">
and approve_id like concat('%',#{req.approveId},'%')
</if>
- <if test="req.approveStatus != null and req.approveStatus != ''">
+ <if test="req.approveStatus != null or req.approveStatus == 0">
and approve_status = #{req.approveStatus}
</if>
+ <if test="req.approveType != null ">
+ and approve_type = #{req.approveType}
+ </if>
+ <if test="req.tenantId != null">
+ and tenant_id = #{req.tenantId}
+ </if>
+ <if test="req.businessNo != null and req.businessNo != ''">
+ and (business_no like concat('%',#{req.businessNo},'%')
+ or business_title like concat('%',#{req.businessNo},'%'))
+ </if>
+ order by create_time desc, id desc
</select>
</mapper>
--
Gitblit v1.9.3