上传该版本用于解决代码冲突，该版本存在一个影响使用的bug，请勿直接打包使用

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

@@ -63,7 +63,6 @@ public class FontController {
     private Power_DeptService power_deptService;
     @Autowired
     private Power_UserMapper power_userMapper;
-
     /**
      * 2.1
      * @ProjectName:    getUserPowerTreeBySysFlag
@@ -562,9 +561,8 @@ public class FontController {
         return result;
     }
 
-
     /**
-     * 通过申请医生id，获取医生名字
+     * 通过申请医生id，获取医生名字,
      * 通过病案deptcode，获取医生对应的科室
      */
     @RequestMapping("/getDoctorNameAndDoctorRoom")
@@ -575,4 +573,25 @@ public class FontController {
         String result = room+","+name;
         return result;
     }
+
+    /**
+     * 通过userName获取deptcode
+     */
+    @RequestMapping("/getDoctorDeptcode")
+    @ResponseBody
+    public String getDoctorDeptcode(Integer userId) throws Exception{
+        //获取deptId
+        String deptId = power_userMapper.selectForDeptId(userId);
+        //获取deptcode
+        String result = null;
+        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+",";
+            }
+        }
+        return result;
+    }
+
 }

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

@@ -1,8 +1,6 @@
 package com.manage.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.manage.dao.Power_UserMapper;
 import com.manage.encrypt.Base64;
 import com.manage.encrypt.MD5;
@@ -13,7 +11,6 @@ import com.manage.service.cache.CacheManager;
 import com.manage.util.*;
 import com.manage.vo.*;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.cxf.endpoint.Client;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -48,7 +45,6 @@ public class LoginController {
     @Autowired
     private Power_UserMapper power_userMapper;
 
-
     @RequestMapping(value = "login",method = RequestMethod.GET)
     public String toLogin(Model model ,HttpServletRequest request){
         CacheManager.addExcCount("noExc");
@@ -58,13 +54,10 @@ public class LoginController {
         return "loginDir/login";
     }
 
-
-
     @RequestMapping(value = "login",method = RequestMethod.POST)
-    public String login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){
+    public String login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model) throws Exception {
         //同一浏览器打开login，直接触发注销登录session
         loginService.removeOldUserOnLogin(request);
-
         try {
             Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser);
             //添加进操作日志
@@ -85,6 +78,7 @@ public class LoginController {
                 String token = UUID.randomUUID().toString();
 
 
+
                 //查询归属医院
              /*   long start5 = System.currentTimeMillis();
                 Power_User_Dict powerUserDict = powerUserDictMapper.selectDictIdByUserId(user.getUserId());

power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java

@@ -5,14 +5,13 @@ import com.manage.dao.Power_DeptMapper;
 import com.manage.dao.Power_MenuMapper;
 import com.manage.encrypt.Base64;
 import com.manage.encrypt.MD5;
-import com.manage.entity.Power_Dept;
 import com.manage.entity.Power_Menu;
 import com.manage.entity.Power_User;
-import com.manage.interfaces.webservice.PowerWebService;
 import com.manage.service.Power_UserService;
-import com.manage.service.User_Dept_MenuService;
 import com.manage.service.cache.Cache;
 import com.manage.service.cache.CacheManager;
+import com.manage.interfaces.webservice.PowerWebService;
+import com.manage.service.User_Dept_MenuService;
 import com.manage.util.Constant;
 import com.manage.vo.Power_UserVo;
 import com.manage.vo.Power_UserWebServiceVo;
@@ -23,10 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.jws.WebService;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 
 @Component
 @WebService(serviceName = "PowerWebService",
@@ -50,7 +46,6 @@ public class PowerWebServiceImpl implements PowerWebService {
     public String getInfosByUserId(String token,String sysFlag) {
         Power_UserWebServiceVo userWebServiceVo = new Power_UserWebServiceVo();
         if(StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token) ){
-            token = MD5.JM(Base64.decode(token));
             Cache cache = CacheManager.getCacheInfo(token);
             if(cache != null){
                 Power_UserVo user = (Power_UserVo) cache.getValue();

power-dao/src/main/java/com/manage/dao/Power_UserMapper.java

@@ -67,16 +67,17 @@ public interface Power_UserMapper {
      * */
     List<Power_User> selectUserIdsWithApprove(@Param("menuUrl")String menuUrl);
 
+    //更新部分
     //根据deptcode科室id查询符合的科主任信息
     List<Power_User> selectAllForChief (String deptCode);
 
     List<Power_User> selectAllForRecordRoom (String deptCode);
 
-    Power_User selectDoctorNameAndDoctorRoom(String userId);
-
-
     Power_User selectForDoctorName (String userId);
 
     Power_User selectForDoctorRoom (String deptCode);
 
+    String selectForDeptId(Integer userId);
+
+    String selectForDeptCode(String deptId);
 }

power-dao/src/main/java/com/manage/vo/Power_UserWebServiceVo.java

@@ -1,6 +1,5 @@
 package com.manage.vo;
 
-import java.util.List;
 import java.util.Set;
 
 public class Power_UserWebServiceVo {
@@ -19,8 +18,6 @@ public class Power_UserWebServiceVo {
     private String updater;
     private String remark;
     private Set<String> menus;
-
-
     public Integer getUserId() {
         return userId;
     }

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

@@ -161,8 +161,6 @@
         dept_code = #{deptCode,jdbcType=VARCHAR}
     where dept_id = #{deptId,jdbcType=INTEGER}
   </update>
-
-
   <!--2019-4-22 ly -->
   <select id="findSomeByMore" resultMap="BaseResultMap">
     select
@@ -324,9 +322,4 @@
       )
     </foreach >
   </insert>
-  <select id="selectByPrimaryKeyDeptId" resultType="com.manage.entity.Power_Dept">
-    select *
-    from power_dept
-    where power_dept.dept_id = #{deptId}
-  </select>
 </mapper>