From fa6e9626876b1f3778575ec14fc723e576463980 Mon Sep 17 00:00:00 2001
From: xm <dolls.acid.0r@icloud.com>
Date: Wed, 15 Dec 2021 08:15:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=90=88=E5=80=9F=E9=98=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/manage/controller/FontController.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 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 0608ec9..57f649e 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -586,23 +586,25 @@ public class FontController {
     @ResponseBody
     public String getDoctorNameAndDoctorRoom(String userId) {
         String name = power_userMapper.selectForDoctorName(userId);
-        if (null == name || name.isEmpty()) {
+        if (StringUtils.isNotBlank(name)) {
             name = "未设置名字账号";
         }
 //        获取的是deptId数组
         String deptIDResult = powerDeptMapper.selectAllDeptId(userId);
-//        拆分成单一的deptId
-        String[] deptIdAll = deptIDResult.split(",");
         String room = "";
-        if (deptIdAll.length != 0) {
+//        拆分成单一的deptId
+        if (deptIDResult.contains(",")) {
+            String[] deptIdAll = deptIDResult.split(",");
             for (int i = 0; i < deptIdAll.length; i++) {
                 String deptIdOne = power_userMapper.selectForDoctorRoom(deptIdAll[i]);
-                if (null != deptIdOne && !deptIdOne.isEmpty()) {
+                if (StringUtils.isNotBlank(deptIdOne)) {
                     room += deptIdOne + "&";
                 } else {
                     room = "未分配科室账号";
                 }
             }
+        } else {
+            room = "账号无对应的科室，请联系管理员核实账号信息！";
         }
         String result = room + "," + name;
         return result;