From b9481f6257ada0d6c17f0664bca97d89d1ee54b3 Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Wed, 17 Aug 2022 09:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E8=B4=A8=E6=8E=A7?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 power-admin/pom.xml                           |  5 ++++
 .../manage/controller/LoginController.java    |  1 -
 .../WEB-INF/views/gatewayDir/gatewayIndex.jsp | 19 +++++++++++++--
 .../webapp/WEB-INF/views/userDir/user.jsp     | 10 ++++++++
 power-admin/src/main/webapp/static/js/user.js | 13 ++++++++++-
 .../java/com/manage/entity/Power_User.java    | 23 +++++++++++++++++++
 .../main/java/com/manage/vo/Power_UserVo.java | 12 ++++++++++
 .../com/manage/vo/Power_UserWebServiceVo.java | 10 ++++++++
 .../resources/mapper/Power_UserMapper.xml     |  6 ++++-
 9 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/power-admin/pom.xml b/power-admin/pom.xml
index a374e3c..2b5de82 100644
--- a/power-admin/pom.xml
+++ b/power-admin/pom.xml
@@ -181,6 +181,11 @@
             <artifactId>vxIPMI</artifactId>
             <version>2.0.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.manage</groupId>
+            <artifactId>power-dao</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>power</finalName>
diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java
index 10d141a..3d5e301 100644
--- a/power-admin/src/main/java/com/manage/controller/LoginController.java
+++ b/power-admin/src/main/java/com/manage/controller/LoginController.java
@@ -131,7 +131,6 @@ public class LoginController {
                     }
                 }
                 user.setRemark(power_depts.toString());
-
                 //设置进缓存
                 CacheManager.putCache(token,new Cache(date,user,TOKEN_EXPIRE_TIME));
                 ActionScopeUtils.setSessionAttribute("CURRENT_USER",user,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))/1000);
diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index d7ebbc3..8a5bd12 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -13,6 +13,21 @@
         var path = "${path}";
     </script>
     <style type="text/css">
+        #u139{
+            transform:translateY(-40%);/**上移元素**/
+            -ms-transform:translateY(-40%);
+            -webkit-transform:translateY(-40%);
+        }
+        #u133{
+            transform:translateY(-40%);/**上移元素**/
+            -ms-transform:translateY(-40%);
+            -webkit-transform:translateY(-40%);
+        }
+        #u145{
+            transform:translateY(-40%);/**上移元素**/
+            -ms-transform:translateY(-40%);
+            -webkit-transform:translateY(-40%);
+        }
         .logo{
             height: 59px!important;
         }
@@ -403,7 +418,7 @@
                                 <div id="u138_div" class=""></div>
                                 <!-- Unnamed () -->
                                 <div id="u139" class="text" style="visibility: visible;text-align: center">
-                                    <p><span>病案归档系统</span></p>
+                                    <p><span>病案无纸化归档系统</span></p>
                                 </div>
                             </div>
                         </a>
@@ -433,7 +448,7 @@
                                 <div id="u144_div" class=""></div>
                                 <!-- Unnamed () -->
                                 <div id="u145" class="text" style="visibility: visible;text-align: center">
-                                    <p><span>档案管理系统</span></p>
+                                    <p><span>病案数码影像信息管理系统</span></p>
                                 </div>
                             </div>
                         </a>
diff --git a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
index bb42997..05e89a6 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
@@ -219,6 +219,16 @@
                             </select>
                         </div>
                     </div>
+                    <div class="formDiv" id="deptIdAdmin">
+                        <label class="control-label left">质控科室：</label>
+                        <div style="width:100%">
+                            <select class="selectpicker" multiple id="deptIdQuality" name="deptIdQuality" style="max-height:400px!important;overflow:scroll;" data-live-search="true" data-actions-box="true">
+                                <c:forEach items="${depts}" var="dept">
+                                    <option value="${dept.deptId}" <c:if test="${deptId == dept.deptId}">selected</c:if>>${dept.deptName}</option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </div>
                     <div class="formDiv">
                         <label  class="control-label left">所属角色：</label>
                         <select class="form-control input input-sm" id="re_roleId" name="roleId">
diff --git a/power-admin/src/main/webapp/static/js/user.js b/power-admin/src/main/webapp/static/js/user.js
index b0e272f..43e2fa1 100644
--- a/power-admin/src/main/webapp/static/js/user.js
+++ b/power-admin/src/main/webapp/static/js/user.js
@@ -308,6 +308,11 @@ function edit(id){
              var deptIds = data.deptId;
              var deptArr = deptIds.split(",");
              $('#deptId').selectpicker('val', deptArr);
+
+
+             var deptIds1 = data.deptIdQuality;
+             var deptArr1 = deptIds1.split(",");
+             $('#deptIdQuality').selectpicker('val', deptArr1);
              if(data.userSex == 1){
                  $("#re_userSex").val("1");
              }else{
@@ -318,7 +323,14 @@ function edit(id){
              $("#re_userEmail").val(data.userEmail);
              $("#re_userPosition").val(data.userPosition);
              $("#txtTreeSelect1").val(data.powerDepts);
+             $("#deptIdQuality").val(data.deptIdQuality);
              $("#deptIds").val(data.deptId);
+             if (deptIds!="16"){
+                 $("#deptIdAdmin").css("display","none")
+                 console.log($("#deptIdAdmin"))
+             }else {
+                 $("#deptIdAdmin").css("display","block")
+             }
              $("#re_roleId").find("option[value='"+data.roleId+"']").attr("selected",true);
              $("#re_effective").find("option[value='"+data.effective+"']").attr("selected",true);
              $("#re_remark").val(data.remark);
@@ -387,7 +399,6 @@ function clearForm(){
 }
 //提交更改
 $('#btn_submit').click(function () {
-    debugger
     var reUserTel = $("#re_userTel").val();
     if(reUserTel != ''){
         if(!reUserTel.match(/^1[34578]\d{9}$/)){
diff --git a/power-dao/src/main/java/com/manage/entity/Power_User.java b/power-dao/src/main/java/com/manage/entity/Power_User.java
index e3970e3..4b08a52 100644
--- a/power-dao/src/main/java/com/manage/entity/Power_User.java
+++ b/power-dao/src/main/java/com/manage/entity/Power_User.java
@@ -4,12 +4,27 @@ package com.manage.entity;
 import java.util.List;
 
 public class Power_User{
+
+
+
+    private String deptIdQuality;
+
     private Integer userId;
 
     private String userName;
 
     private String name;
 
+    public String getDeptId1() {
+        return deptId1;
+    }
+
+    public void setDeptId1(String deptId1) {
+        this.deptId1 = deptId1;
+    }
+
+    private String deptId1;
+
     private String userPwd;
 
     private Integer userSex;
@@ -89,6 +104,14 @@ public class Power_User{
         return name;
     }
 
+    public String getDeptIdQuality() {
+        return deptIdQuality;
+    }
+
+    public void setDeptIdQuality(String deptIdQuality) {
+        this.deptIdQuality = deptIdQuality;
+    }
+
     public void setName(String name) {
         this.name = name;
     }
diff --git a/power-dao/src/main/java/com/manage/vo/Power_UserVo.java b/power-dao/src/main/java/com/manage/vo/Power_UserVo.java
index b54c6fe..26bf1d2 100644
--- a/power-dao/src/main/java/com/manage/vo/Power_UserVo.java
+++ b/power-dao/src/main/java/com/manage/vo/Power_UserVo.java
@@ -36,6 +36,18 @@ public class Power_UserVo extends Power_User {
 
     private Integer showRecord;
 
+    public String getDeptIdQuality() {
+        return deptIdQuality;
+    }
+
+    public void setDeptIdQuality(String deptIdQuality) {
+        this.deptIdQuality = deptIdQuality;
+    }
+
+    private String deptIdQuality;
+
+
+
     private Integer downloadRecord;
 
     private Integer showPrint;
diff --git a/power-dao/src/main/java/com/manage/vo/Power_UserWebServiceVo.java b/power-dao/src/main/java/com/manage/vo/Power_UserWebServiceVo.java
index 950427d..03bf569 100644
--- a/power-dao/src/main/java/com/manage/vo/Power_UserWebServiceVo.java
+++ b/power-dao/src/main/java/com/manage/vo/Power_UserWebServiceVo.java
@@ -18,6 +18,16 @@ public class Power_UserWebServiceVo {
     private String updater;
     private String remark;
     private Set<String> menus;
+
+    public String getDeptIdQuality() {
+        return deptIdQuality;
+    }
+
+    public void setDeptIdQuality(String deptIdQuality) {
+        this.deptIdQuality = deptIdQuality;
+    }
+
+    private String deptIdQuality;
     public Integer getUserId() {
         return userId;
     }
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index c34fae1..522efe9 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -31,7 +31,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     user_id, user_name,name, user_pwd, user_sex, user_age, user_tel, user_email, user_position,
-    role_id, dept_id, effective, create_date, creater, update_date, updater, remark
+    role_id, dept_id, effective, create_date, creater, update_date, updater, remark,dept_id_quality
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -196,6 +196,9 @@
       <if test="deptId != null and deptId != ''">
         dept_id = #{deptId,jdbcType=VARCHAR},
       </if>
+      <if test="deptIdQuality != null and deptIdQuality != ''">
+        dept_id_quality = #{deptIdQuality,jdbcType=VARCHAR},
+      </if>
       <if test="effective != null">
         effective = #{effective,jdbcType=INTEGER},
       </if>
@@ -253,6 +256,7 @@
         power_user.update_date,
         power_user.updater,
         power_user.remark,
+        dept_id_quality,
         GROUP_CONCAT(power_dept.dept_name) powerDepts
     FROM
         power_user