From 477c18f08b2918f24f56d4e082146cdd35b0264c Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 06 Jun 2024 12:01:50 +0800
Subject: [PATCH] 错误引入信息清除
---
blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java | 26 +++++---------------------
1 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java b/blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java
index 1303f10..45e13bb 100644
--- a/blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java
+++ b/blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.system.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -21,8 +5,8 @@
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.system.cache.DictCache;
-import org.springblade.system.cache.SysCache;
+import org.springblade.common.cache.DictCache;
+import org.springblade.common.cache.SysCache;
import org.springblade.system.entity.Dept;
import org.springblade.system.enums.DictEnum;
import org.springblade.system.vo.DeptVO;
@@ -51,7 +35,7 @@
Dept parent = SysCache.getDept(dept.getParentId());
deptVO.setParentName(parent.getDeptName());
}
- String category = DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory());
+ String category = DictCache.getValue(DictEnum.ORG_CATEGORY.getName(), dept.getDeptCategory());
deptVO.setDeptCategoryName(category);
return deptVO;
}
@@ -60,7 +44,7 @@
public List<DeptVO> listNodeVO(List<Dept> list) {
List<DeptVO> collect = list.stream().map(dept -> {
DeptVO deptVO = BeanUtil.copy(dept, DeptVO.class);
- String category = DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory());
+ String category = DictCache.getValue(DictEnum.ORG_CATEGORY.getName(), dept.getDeptCategory());
Objects.requireNonNull(deptVO).setDeptCategoryName(category);
return deptVO;
}).collect(Collectors.toList());
@@ -69,7 +53,7 @@
public List<DeptVO> listNodeLazyVO(List<DeptVO> list) {
List<DeptVO> collect = list.stream().peek(dept -> {
- String category = DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory());
+ String category = DictCache.getValue(DictEnum.ORG_CATEGORY.getName(), dept.getDeptCategory());
Objects.requireNonNull(dept).setDeptCategoryName(category);
}).collect(Collectors.toList());
return ForestNodeMerger.merge(collect);
--
Gitblit v1.9.3