上传该版本用于解决代码冲突，该版本存在一个影响使用的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/controller/PageController.java

@@ -133,7 +133,7 @@ public class PageController {
                 CacheManager.addExcCount("exc");
             }
         }
-      //查询当前用户
+        //查询当前用户
         Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER");
         //查询系统权限
         List<Power_Sys_Dict> sysList = new ArrayList<>();

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",
@@ -48,9 +44,8 @@ public class PowerWebServiceImpl implements PowerWebService {
 
     @Override
     public String getInfosByUserId(String token,String sysFlag) {
-         Power_UserWebServiceVo userWebServiceVo = new Power_UserWebServiceVo();
+        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

@@ -18,20 +18,20 @@
     remark,dept_code
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-        power_dept.dept_id,
-        power_dept.dept_name,
-        power_dept.dict_id,
-        power_dept.effective,
-        power_dept.create_date,
-        power_dept.creater,
-        power_dept.update_date,
-        power_dept.updater,
-        power_dept.remark,
-        power_sys_dict.hospital_name,
-        power_dept.dept_code
+    select
+      power_dept.dept_id,
+      power_dept.dept_name,
+      power_dept.dict_id,
+      power_dept.effective,
+      power_dept.create_date,
+      power_dept.creater,
+      power_dept.update_date,
+      power_dept.updater,
+      power_dept.remark,
+      power_sys_dict.hospital_name,
+      power_dept.dept_code
     from power_dept
-    LEFT JOIN power_sys_dict ON power_sys_dict.dict_id = power_dept.dict_id
+           LEFT JOIN power_sys_dict ON power_sys_dict.dict_id = power_dept.dict_id
     where power_dept.dept_id = #{deptId,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
@@ -39,14 +39,14 @@
     where dept_id = #{deptId,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.manage.entity.Power_Dept">
-    insert into power_dept (dept_id, dept_name, dict_id, 
-      effective, create_date, creater, 
-      update_date, updater, remark,dept_code
-      )
+    insert into power_dept (dept_id, dept_name, dict_id,
+                            effective, create_date, creater,
+                            update_date, updater, remark,dept_code
+    )
     values (#{deptId,jdbcType=INTEGER}, #{deptName,jdbcType=VARCHAR}, #{dictId,jdbcType=INTEGER},
-      #{effective,jdbcType=INTEGER}, #{createDate,jdbcType=CHAR}, #{creater,jdbcType=VARCHAR},
-      #{updateDate,jdbcType=CHAR}, #{updater,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},#{deptCode,jdbcType=VARCHAR}
-      )
+            #{effective,jdbcType=INTEGER}, #{createDate,jdbcType=CHAR}, #{creater,jdbcType=VARCHAR},
+            #{updateDate,jdbcType=CHAR}, #{updater,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},#{deptCode,jdbcType=VARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.manage.entity.Power_Dept">
     insert into power_dept
@@ -151,31 +151,29 @@
   <update id="updateByPrimaryKey" parameterType="com.manage.entity.Power_Dept">
     update power_dept
     set dept_name = #{deptName,jdbcType=VARCHAR},
-      dict_id = #{dictId,jdbcType=INTEGER},
-      effective = #{effective,jdbcType=INTEGER},
-      create_date = #{createDate,jdbcType=CHAR},
-      creater = #{creater,jdbcType=VARCHAR},
-      update_date = #{updateDate,jdbcType=CHAR},
-      updater = #{updater,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=VARCHAR},
-      dept_code = #{deptCode,jdbcType=VARCHAR}
+        dict_id = #{dictId,jdbcType=INTEGER},
+        effective = #{effective,jdbcType=INTEGER},
+        create_date = #{createDate,jdbcType=CHAR},
+        creater = #{creater,jdbcType=VARCHAR},
+        update_date = #{updateDate,jdbcType=CHAR},
+        updater = #{updater,jdbcType=VARCHAR},
+        remark = #{remark,jdbcType=VARCHAR},
+        dept_code = #{deptCode,jdbcType=VARCHAR}
     where dept_id = #{deptId,jdbcType=INTEGER}
   </update>
-
-
   <!--2019-4-22 ly -->
   <select id="findSomeByMore" resultMap="BaseResultMap">
     select
-        power_dept.dept_id,
-        power_dept.dept_name,
-        power_dept.dict_id,
-        power_dept.effective,
-        power_dept.create_date,
-        power_dept.creater,
-        power_dept.update_date,
-        power_dept.updater,
-        power_dept.remark,
-        power_sys_dict.hospital_name
+    power_dept.dept_id,
+    power_dept.dept_name,
+    power_dept.dict_id,
+    power_dept.effective,
+    power_dept.create_date,
+    power_dept.creater,
+    power_dept.update_date,
+    power_dept.updater,
+    power_dept.remark,
+    power_sys_dict.hospital_name
     from power_dept
     left join power_sys_dict on power_sys_dict.dict_id = power_dept.dict_id
     where 1 = 1
@@ -196,20 +194,20 @@
     </if>
     ORDER BY create_date DESC,power_dept.dept_id DESC
     <if test="offset != null and limit != null">
-        LIMIT #{offset},#{limit}
+      LIMIT #{offset},#{limit}
     </if>
   </select>
   <!--验证同一医院科室名不能重复-->
   <select id="checkDeptName" resultMap="BaseResultMap" parameterType="java.lang.String">
-      SELECT
-          dept_id
-      FROM
-          power_dept
-      WHERE
-          dept_name = #{deptName}
-      <if test="dictId != null">
-          AND dict_id = #{dictId}
-      </if>
+    SELECT
+    dept_id
+    FROM
+    power_dept
+    WHERE
+    dept_name = #{deptName}
+    <if test="dictId != null">
+      AND dict_id = #{dictId}
+    </if>
   </select>
   <select id="getTotal" resultType="int">
     SELECT count(1) FROM power_dept WHERE 1 = 1
@@ -237,10 +235,10 @@
     from power_dept
     where 1=1
     <if test="list !=null and list!=''">
-    and dept_id in
-    <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
-      #{item}
-    </foreach>
+      and dept_id in
+      <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+        #{item}
+      </foreach>
     </if>
   </select>
   <select id="selectDeptByDeptName" parameterType="HashMap" resultMap="BaseResultMap">
@@ -258,56 +256,56 @@
   <!--根据权限查询医院科室树-->
   <select id="selectDeptByUserId" resultMap="BaseResultMap" parameterType="java.lang.Integer">
     SELECT
-        power_sys_dict.dict_id,
-        power_sys_dict.hospital_name,
-        power_dept.dept_id,
-        power_dept.dept_name
+    power_sys_dict.dict_id,
+    power_sys_dict.hospital_name,
+    power_dept.dept_id,
+    power_dept.dept_name
     FROM
-        power_dept
+    power_dept
     INNER JOIN power_sys_dict ON power_sys_dict.dict_id = power_dept.dict_id
     WHERE
-        power_sys_dict.dict_status = 1
+    power_sys_dict.dict_status = 1
     AND power_dept.effective = 1
-      <if test="userId != null">
-        and power_sys_dict.dict_id = (select power_user_dict.dict_id from power_user_dict WHERE power_user_dict.user_id = ${userId})
-      </if>
+    <if test="userId != null">
+      and power_sys_dict.dict_id = (select power_user_dict.dict_id from power_user_dict WHERE power_user_dict.user_id = ${userId})
+    </if>
   </select>
   <!--根据医院id查科室集合-->
   <select id="selectDeptByDictId" resultMap="BaseResultMap">
     SELECT
-        power_dept.dept_id,
-        power_dept.dept_name
-        <if test="sysFlag != null and sysFlag != ''">
-          ,power_sys_dict.dept_id checks
-        </if>
+    power_dept.dept_id,
+    power_dept.dept_name
+    <if test="sysFlag != null and sysFlag != ''">
+      ,power_sys_dict.dept_id checks
+    </if>
     FROM
-        power_dept
-        <if test="sysFlag != null and sysFlag != ''">
-          LEFT JOIN
-          power_sys_dict on power_dept.dept_id = power_sys_dict.dept_id and sys_flag = #{sysFlag}
-        </if>
+    power_dept
+    <if test="sysFlag != null and sysFlag != ''">
+      LEFT JOIN
+      power_sys_dict on power_dept.dept_id = power_sys_dict.dept_id and sys_flag = #{sysFlag}
+    </if>
     WHERE
-        effective = 1
-      <if test="dictId != null">
-        AND
-          power_dept.dict_id = #{dictId}
-      </if>
+    effective = 1
+    <if test="dictId != null">
+      AND
+      power_dept.dict_id = #{dictId}
+    </if>
   </select>
 
   <!--批量插入-->
   <insert id="SimpleInsert" parameterType="java.util.List">
     INSERT INTO power_dept(
-      dept_id,
-      dept_name,
-      dict_id,
-      effective,
-      create_date,
-      creater,
-      update_date,
-      updater,
-      remark,
-      dept_code
-      )
+    dept_id,
+    dept_name,
+    dict_id,
+    effective,
+    create_date,
+    creater,
+    update_date,
+    updater,
+    remark,
+    dept_code
+    )
     VALUES
     <foreach collection ="list" item="item" index= "index" separator =",">
       (
@@ -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>