From 0bae1a6188a5feeccda0289c1227786a5480039b Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 13 Oct 2020 09:38:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=94=A8=E6=88=B7=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E8=8F=9C=E5=8D=95=E6=90=9C=E7=B4=A2=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 power-admin/src/main/webapp/static/js/user.js                  | 1 -
 power-dao/src/main/resources/mapper/PowerMapper.xml            | 2 +-
 .../src/main/java/com/manage/service/cache/CacheManager.java   | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/power-admin/src/main/webapp/static/js/user.js b/power-admin/src/main/webapp/static/js/user.js
index 6b0b2fe..5acffc3 100644
--- a/power-admin/src/main/webapp/static/js/user.js
+++ b/power-admin/src/main/webapp/static/js/user.js
@@ -390,7 +390,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/resources/mapper/PowerMapper.xml b/power-dao/src/main/resources/mapper/PowerMapper.xml
index 4faafee..c0a43fe 100644
--- a/power-dao/src/main/resources/mapper/PowerMapper.xml
+++ b/power-dao/src/main/resources/mapper/PowerMapper.xml
@@ -35,7 +35,7 @@
         </if>
         sys_name is null and dict_status = 1) and dict_status = 1
         UNION ALL
-        select 3 as level,power_dept.dict_id parent_id,dept_name name,dept_name new_name,null
+        select DISTINCT 3 as level,power_dept.dict_id parent_id,dept_name name,dept_name new_name,null
         sys_flag,power_dept.dept_id,null as self_id,null as tel,null as real_name from power_dept
         <if test="key != null and key != ''">
             INNER JOIN power_user on FIND_IN_SET(power_dept.dept_id,power_user.dept_id) and power_user.effective = 1 and
diff --git a/power-service/src/main/java/com/manage/service/cache/CacheManager.java b/power-service/src/main/java/com/manage/service/cache/CacheManager.java
index 8c33df6..cbe1a21 100644
--- a/power-service/src/main/java/com/manage/service/cache/CacheManager.java
+++ b/power-service/src/main/java/com/manage/service/cache/CacheManager.java
@@ -3,9 +3,10 @@ package com.manage.service.cache;
 import com.manage.vo.Power_UserVo;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class CacheManager {
-    private static HashMap<String,Cache> cacheMap = new HashMap<String,Cache>();
+    private static Map<String,Cache> cacheMap = new ConcurrentHashMap<String,Cache>();
     //添加异常数量
     public static void addExcCount(String type){
         if("noExc".equals(type)){