From 8f947e87f12764012bf78774c70db728be608d2b Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 8 Apr 2024 10:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=BC=E5=85=A5=EF=BC=8C=E5=91=BC=E5=87=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/system/domain/FsChannelRecordVo.java | 5 +++++
 .../main/resources/mapper/system/FsChannelRecordMapper.xml   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecordVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecordVo.java
index 5a4104f..c9cbb74 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecordVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecordVo.java
@@ -264,6 +264,11 @@ public class FsChannelRecordVo implements Serializable {
      */
     private Date dealtime;
 
+    /**
+     * 所属部门
+     */
+    private String department;
+
 
 
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml
index 90e77a2..7ca5099 100644
--- a/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml
@@ -81,7 +81,7 @@
         a.aj AS aj,
         a.is_lost AS is_lost,
         a.code AS code,
-        (SELECT t.department FROM external_department t where t.code=a.code) as department,
+        (SELECT t.department FROM department_manage t where t.code=a.code) as department,
         a.pid AS pid,
         a.ring_time AS ring_time,
         a.list_in AS list_in,