修复了部分数据获取的bug，添加了借阅功能的使用说明视频

power-admin/src/main/java/com/manage/controller/FontController.java

@@ -586,25 +586,31 @@ public class FontController {
     @ResponseBody
     public String getDoctorNameAndDoctorRoom(String userId) {
         String name = power_userMapper.selectForDoctorName(userId);
-        if (StringUtils.isNotBlank(name)) {
+        if (StringUtils.isEmpty(name)) {
             name = "未设置名字账号";
         }
 //        获取的是deptId数组
         String deptIDResult = powerDeptMapper.selectAllDeptId(userId);
         String room = "";
 //        拆分成单一的deptId
-        if (deptIDResult.contains(",")) {
+        if (!StringUtils.isEmpty(deptIDResult) && deptIDResult.contains(",")) {
             String[] deptIdAll = deptIDResult.split(",");
             for (int i = 0; i < deptIdAll.length; i++) {
                 String deptIdOne = power_userMapper.selectForDoctorRoom(deptIdAll[i]);
-                if (StringUtils.isNotBlank(deptIdOne)) {
+                if (!StringUtils.isEmpty(deptIdOne)) {
-                    room += deptIdOne + "&";
+                    room += deptIdOne + "和";
                 } else {
                     room = "未分配科室账号";
                 }
             }
+            room = room.substring(0, room.length() - 1);
         } else {
-            room = "账号无对应的科室，请联系管理员核实账号信息！";
+            String deptIdOne = power_userMapper.selectForDoctorRoom(deptIDResult);
+            if (StringUtils.isEmpty(deptIdOne)) {
+                room = "未分配科室账号";
+            } else {
+                room = deptIdOne;
+            }
         }
         String result = room + "," + name;
         return result;

power-admin/src/main/webapp/WEB-INF/views/videoDir/video.jsp

@@ -62,6 +62,10 @@
                 <span class="glyphicon glyphicon-play" aria-hidden="true"></span>点击查看科主任审核视频
             </div>
         </c:if>
+<%--        借阅功能视频--%>
+        <div id="onclick8" onclick="getVideoShowPage('8')" style="cursor:pointer; margin-top: 2px;">
+            <span class="glyphicon glyphicon-play" aria-hidden="true"></span>点击查看借阅功能使用视频
+        </div>
         <%--<div onclick="getVideoShowPage('8')" style="cursor:pointer">
             点击查看高拍仪扫描上传文件视频
         </div>--%>

power-admin/src/main/webapp/static/js/video.js

@@ -28,6 +28,9 @@ function getVideoShowPage(videoType) {
     if (null != document.getElementById("onclick7")) {
         document.getElementById("onclick7").style.color = "";
     }
+    if (null != document.getElementById("onclick8")) {
+        document.getElementById("onclick8").style.color = "";
+    }
     if (videoType == 1) {
         document.getElementById("onclick1").style.color = "red";
     }
@@ -49,6 +52,9 @@ function getVideoShowPage(videoType) {
     if (videoType == 7) {
         document.getElementById("onclick7").style.color = "red";
     }
+    if (videoType == 9) {
+        document.getElementById("onclick8").style.color = "red";
+    }
     $("#iframeVideoDiv").show();
     $("#iframe").prop("src",path+"/video/videoShow?videoType=" + videoType);
 }

power-dao/src/main/resources/mapper/Power_DeptMapper.xml

@@ -307,7 +307,7 @@
     WHERE dept_id = #{deptId}
   </select>
   <select id="selectAllDeptId" resultType="java.lang.String">
-    select *
+    select power_user.dept_id
     from power_user
     WHERE power_user.user_name = #{userId}
   </select>

power-dao/src/main/resources/mapper/Power_UserMapper.xml

@@ -728,7 +728,7 @@
     select
       power_dept.dept_name dept_id
     from power_dept
-    where power_dept.dept_code = #{deptCode}
+    where power_dept.dept_id = #{deptCode}
   </select>
     <select id="selectForDeptId" resultType="java.lang.String">
       SELECT