From c875dbe7f12ce5b9fd2f161040980f997a000c8b Mon Sep 17 00:00:00 2001
From: xm <dolls.acid.0r@icloud.com>
Date: Sat, 20 Nov 2021 10:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/manage/controller/FontController.java |  4 ++--
 .../resources/mapper/Power_UserMapper.xml     | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 12 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 3536050..25f4622 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -582,12 +582,12 @@ public class FontController {
         //获取deptId
         String deptId = power_userMapper.selectForDeptId(userId);
         //获取deptcode
-        String result = null;
+        String result = "";
         String [] deptIdSingle = deptId.split(",");
         if (deptIdSingle!=null&&deptIdSingle.length>0){
             for (int i = 0; i < deptIdSingle.length; i++) {
                 String deptCode = power_userMapper.selectForDeptCode(deptIdSingle[i]);
-                result = deptCode+",";
+                result += deptCode+",";
             }
         }
         return result;
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index b9fc5cc..5e79347 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -720,16 +720,6 @@
                                         where dept_code = #{deptCode}<![CDATA[),]]>'%')
       and effective = 1
       and role_id in (20，22)
-  </select>
-  <select id="selectDoctorNameAndDoctorRoom" resultType="com.manage.entity.Power_User">
-    SELECT user_id,
-           user_name,
-           power_user.name
-    from power_user
-    where  dept_id like concat(	'%',(select dept_id
-                                        from power_dept
-                                        where dept_code = #{deptCode <![CDATA[}]]> ),'%')
-      and effective = 1
   </select>
     <select id="selectForDoctorName" resultType="com.manage.entity.Power_User">
       select power_user.`name`
@@ -743,4 +733,17 @@
     from power_dept
     where power_dept.dept_code = #{deptCode}
   </select>
+    <select id="selectForDeptId" resultType="java.lang.String">
+      SELECT
+        power_user.dept_id
+      FROM
+        `power_user`
+      where
+        power_user.user_id = #{userId}
+    </select>
+  <select id="selectForDeptCode" resultType="java.lang.String">
+    SELECT dept_code
+    FROM `power_dept`
+    WHERE dept_id = #{deptId}
+  </select>
 </mapper>
\ No newline at end of file