github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:elunez/eladmin

pull/590/head
zhengjie 2021-02-01 20:50:51 +08:00
parent fdf82d2479 5381ac38ce
commit 8fd14d4ea1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
View File

@ -95,7 +95,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
File file = null; File file = null;
try { try {
// 用uuid作为文件名，防止生成的临时文件重复 // 用uuid作为文件名，防止生成的临时文件重复
file = File.createTempFile(IdUtil.simpleUUID(), prefix); file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
// MultipartFile to File // MultipartFile to File
multipartFile.transferTo(file); multipartFile.transferTo(file);
} catch (IOException e) { } catch (IOException e) {

6
eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java
View File

@ -81,12 +81,12 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
/** /**
* 根据角色中的部门查询 * 根据角色中的部门查询
* @param id / * @param deptId /
* @return / * @return /
*/ */
@Query(value = "SELECT u.* FROM sys_user u, sys_users_roles r, sys_roles_depts d WHERE " + @Query(value = "SELECT u.* FROM sys_user u, sys_users_roles r, sys_roles_depts d WHERE " +
"u.user_id = r.user_id AND r.role_id = d.role_id AND r.role_id = ?1 group by u.user_id", nativeQuery = true) "u.user_id = r.user_id AND r.role_id = d.role_id AND d.dept_id = ?1 group by u.user_id", nativeQuery = true)
List<User> findByDeptRoleId(Long id); List<User> findByRoleDeptId(Long deptId);
/** /**
* 根据菜单查询 * 根据菜单查询

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java
View File

@ -273,7 +273,7 @@ public class DeptServiceImpl implements DeptService {
* @param id / * @param id /
*/ */
public void delCaches(Long id){ public void delCaches(Long id){
List<User> users = userRepository.findByDeptRoleId(id); List<User> users = userRepository.findByRoleDeptId(id);
// 删除数据权限 // 删除数据权限
redisUtils.delByKeys(CacheKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet())); redisUtils.delByKeys(CacheKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
redisUtils.del(CacheKey.DEPT_ID + id); redisUtils.del(CacheKey.DEPT_ID + id);