From bf528ecdc90fc6652c7cee038078f11f622f8f58 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Sun, 9 Oct 2022 15:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=B0=83=E6=95=B4=202022-10-09=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/heai/modules/ftp/controller/SysFtpController.java     | 1 +
 src/main/resources/mapper/taskmanage/TaskDatailDao.xml        | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/heai/modules/ftp/controller/SysFtpController.java b/src/main/java/com/heai/modules/ftp/controller/SysFtpController.java
index ff16c29..94b6c81 100644
--- a/src/main/java/com/heai/modules/ftp/controller/SysFtpController.java
+++ b/src/main/java/com/heai/modules/ftp/controller/SysFtpController.java
@@ -96,6 +96,7 @@ public class SysFtpController extends AbstractController {
 		ossEntity.setCreatedBy(user.getUsername());
 		ossEntity.setFileSuffix(suffix);
 		sysOssService.save(ossEntity);
+		newFile.delete();
 		return uploadStatus?R.ok().put("ossEntity", ossEntity):R.error("上附件失败");
 	}
 
diff --git a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
index 1d9faca..90d8bc7 100644
--- a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
+++ b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
@@ -6,8 +6,6 @@
     <!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.heai.modules.taskmanage.entity.TaskDetailEntity" id="taskListMap">
         <result property="id" column="id"/>
-
-        <result property="taskDescription" column="task_description"/>
         <result property="department" column="department"/>
         <result property="status" column="status"/>
         <result property="createdDate" column="created_date"/>
@@ -39,7 +37,7 @@
         <where>
             td.site = #{site}
             <if test="department != null and department != ''">
-                and tl.department like #{department}
+                and td.department like #{department}
             </if>
             <if test="customer != null and customer != ''">
                 and tl.customer like #{customer}