From 26b59eec8cec43b0eb2c51ae1ac034c449126de7 Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Wed, 18 May 2022 18:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=9F=A5=E6=88=BF=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/controller/LoginController.java    |  3 +++
 .../src/main/webapp/static/css/login.css      | 13 ++++++++++++
 .../src/main/webapp/static/js/login.js        |  4 ++++
 .../java/com/manage/entity/Power_User.java    |  3 +++
 .../main/java/com/manage/vo/Power_UserVo.java |  4 ++--
 .../com/manage/vo/Power_UserWebServiceVo.java | 20 +++++++++++++++++++
 .../resources/mapper/Power_UserMapper.xml     |  2 ++
 7 files changed, 47 insertions(+), 2 deletions(-)

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 6f19824..e20074b 100644
--- a/power-admin/src/main/java/com/manage/controller/LoginController.java
+++ b/power-admin/src/main/java/com/manage/controller/LoginController.java
@@ -19,6 +19,8 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -129,6 +131,7 @@ public class LoginController {
                 CacheManager.putCache(token,new Cache(user,System.currentTimeMillis(),TOKEN_EXPIRE_TIME*1000));
                 ActionScopeUtils.setSessionAttribute("token",token,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME)));
                 ActionScopeUtils.setSessionAttribute("CURRENT_USER",user,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME)));
+                Power_User user1 = (Power_User)request.getSession().getAttribute("CURRENT_USER");
                 //单点登录跳转
                 String url = "";
                 if(sysFlag == 2){
diff --git a/power-admin/src/main/webapp/static/css/login.css b/power-admin/src/main/webapp/static/css/login.css
index fc09b85..a28d1f5 100644
--- a/power-admin/src/main/webapp/static/css/login.css
+++ b/power-admin/src/main/webapp/static/css/login.css
@@ -70,6 +70,19 @@ h3{
     margin-top: 11%;
 }
 /**
+*二维码div
+*/
+.qRCodeDiv{
+    width: 70%;
+    height: 240px;
+    margin-left: 80px;
+    margin-top: 11%;
+}
+.QRcordImg{
+    margin-left: -20px;
+    margin-top: -8%;
+}
+/**
 *尾部
 */
 .login_foot{
diff --git a/power-admin/src/main/webapp/static/js/login.js b/power-admin/src/main/webapp/static/js/login.js
index 1d2758d..9e5d2c4 100644
--- a/power-admin/src/main/webapp/static/js/login.js
+++ b/power-admin/src/main/webapp/static/js/login.js
@@ -1,3 +1,6 @@
+
+
+
 /**
  * Created by ljx on 2019/4/25.
  */
@@ -64,6 +67,7 @@ function login(){
     }
 }
 
+
 var interval ="";
 var qrCodeIdentity ="";
     function handoffLogin(){
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 9dae1cf..500d1d9 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
@@ -1,6 +1,7 @@
 package com.manage.entity;
 
 
+import sun.security.provider.certpath.DistributionPointFetcher;
 
 public class Power_User{
     private Integer userId;
@@ -39,6 +40,8 @@ public class Power_User{
 
     private String userWechat;
 
+  
+
     public String getUserWechat() {
         return userWechat;
     }
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 4c5e5f2..00525c4 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
@@ -24,6 +24,8 @@ public class Power_UserVo extends Power_User {
 
     private String deptName;
 
+    private String deptCode;
+
     private String sex;
 
     private Integer isUpdate;
@@ -46,8 +48,6 @@ public class Power_UserVo extends Power_User {
 
     private List<User> userList;
 
-    private String deptCode;
-
     public String getDeptCode() {
         return deptCode;
     }
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 d6065c0..5659596 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
@@ -16,7 +16,27 @@ public class Power_UserWebServiceVo {
     private String creater;
     private String updateDate;
     private String updater;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     private String remark;
+    private String deptName;
+    private String deptCode;
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
     private Set<String> menus;
 
     public Integer getUserId() {
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index bb39646..c60a112 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -251,6 +251,8 @@
         power_user.update_date,
         power_user.updater,
         power_user.remark,
+        power_dept.dept_name,
+        power_user.dept_code,
         GROUP_CONCAT(power_dept.dept_name) powerDepts
     FROM
         power_user