From 8bafe9b1357c8e08c38b0b9199c9962ea0552cf5 Mon Sep 17 00:00:00 2001
From: xm <dolls.acid.0r@icloud.com>
Date: Fri, 31 Dec 2021 11:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=E7=A7=91?=
 =?UTF-8?q?=E5=AE=A4=E5=90=8D=E7=A7=B0=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/manage/controller/FontController.java  | 5 +++--
 power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java | 2 +-
 power-dao/src/main/resources/mapper/Power_DeptMapper.xml     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java
index 0438178..307bd61 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -654,8 +654,9 @@ public class FontController {
     @ResponseBody
     public String getDeptCodeByChinese(String deptCode) {
         //获取realName
-        String chineseName = powerDeptMapper.getDeptCodeByChinese(deptCode);
-        return chineseName;
+        Power_Dept deptCodeByChinese = powerDeptMapper.getDeptCodeByChinese(deptCode);
+        String deptName = deptCodeByChinese.getDeptName();
+        return deptName;
     }
 
 
diff --git a/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java b/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java
index 64b2181..4748a25 100644
--- a/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java
+++ b/power-dao/src/main/java/com/manage/dao/Power_DeptMapper.java
@@ -42,7 +42,7 @@ public interface Power_DeptMapper {
 
     Power_Dept selectByPrimaryKeyDeptId(Integer deptId);
 
-    String getDeptCodeByChinese(String deptCode);
+    Power_Dept getDeptCodeByChinese(String deptCode);
 
 
     List<Power_Dept> getDeptCodeAndDeptCodeChinese(String s);
diff --git a/power-dao/src/main/resources/mapper/Power_DeptMapper.xml b/power-dao/src/main/resources/mapper/Power_DeptMapper.xml
index 1591be9..91368b1 100644
--- a/power-dao/src/main/resources/mapper/Power_DeptMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_DeptMapper.xml
@@ -291,7 +291,7 @@
       power_dept.dict_id = #{dictId}
     </if>
   </select>
-  <select id="getDeptCodeByChinese" resultType="java.lang.String">
+  <select id="getDeptCodeByChinese" resultType="com.manage.entity.Power_Dept">
     SELECT dept_name
     from power_dept
     WHERE dept_code = #{deptCode}