From 6892c31200a7ed1b0e60ee5aff794b1fcecc7ef6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 01 十一月 2023 16:28:06 +0800
Subject: [PATCH] 解决文件上传时，文件名重复问题
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index c708c95..d885da3 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper">
- <resultMap type="ServiceDonatebaseinfo" id="ServiceDonatebaseinfoResult">
+ <resultMap type="com.ruoyi.project.domain.ServiceDonatebaseinfo" id="ServiceDonatebaseinfoResult">
<result property="id" column="ID" />
<result property="name" column="Name" />
<result property="sex" column="Sex" />
@@ -69,6 +69,7 @@
<result property="del_flag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
+ <result property="terminationCase" column="termination_case" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="nation" column="Nation" />
@@ -87,6 +88,11 @@
<result property="infophone" column="infoPhone" />
<result property="deptid" column="deptid" />
<result property="deptname" column="deptname" />
+ <result property="leaderno" column="leaderno" />
+ <result property="leadername" column="leadername" />
+ <result property="businessarea" column="businessarea" />
+ <result property="annexfiles" column="annexfiles" />
+ <result property="workflow" column="workflow" />
</resultMap>
@@ -99,7 +105,7 @@
where ID = #{id}
</update>
- <select id="selectServiceDonatebaseinfoList" parameterType="ServiceDonatebaseinfo" resultMap="ServiceDonatebaseinfoResult">
+ <select id="selectServiceDonatebaseinfoList" parameterType="com.ruoyi.project.domain.ServiceDonatebaseinfo" resultMap="ServiceDonatebaseinfoResult">
<include refid="selectServiceDonatebaseinfoVo"/>
<where>
service_donatebaseinfo.del_flag = 0
@@ -180,6 +186,9 @@
<if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
<if test="deptid != null "> and deptid = #{deptid}</if>
<if test="deptname != null "> and deptname = #{deptname}</if>
+ <if test="leaderno != null "> and leaderno = #{leaderno}</if>
+ <if test="leadername != null "> and leadername = #{leadername}</if>
+ <if test="businessarea != null "> and businessarea = #{businessarea}</if>
</where>
order by ReportTime desc
--
Gitblit v1.9.3