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 @@ 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 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 cacheMap = new HashMap(); + private static Map cacheMap = new ConcurrentHashMap(); //添加异常数量 public static void addExcCount(String type){ if("noExc".equals(type)){