From 300e9e6779c1be45bdd6aae113224ec117c7fe19 Mon Sep 17 00:00:00 2001
From: lishangbu <shangshili@hotmail.com>
Date: Wed, 29 Dec 2021 13:33:05 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.dict=E7=9A=84typ?=
 =?UTF-8?q?e=E6=94=B9=E4=B8=BAdictType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java   | 2 +-
 .../com/pig4cloud/pigx/admin/controller/SysDictController.java  | 2 +-
 .../pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java
index 330832111..deb88c969 100755
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java
@@ -67,7 +67,7 @@ public class SysDictItem extends Model<SysDictItem> {
 	 * 类型
 	 */
 	@ApiModelProperty(value = "类型")
-	private String type;
+	private String dictType;
 
 	/**
 	 * 描述
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java
index 8cf62469e..0a595e443 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java
@@ -84,7 +84,7 @@ public class SysDictController {
 	@GetMapping("/type/{type}")
 	@Cacheable(value = CacheConstants.DICT_DETAILS, key = "#type", unless = "#result.data.isEmpty()")
 	public R getDictByType(@PathVariable String type) {
-		return R.ok(sysDictItemService.list(Wrappers.<SysDictItem>query().lambda().eq(SysDictItem::getType, type)));
+		return R.ok(sysDictItemService.list(Wrappers.<SysDictItem>query().lambda().eq(SysDictItem::getDictType, type)));
 	}
 
 	/**
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
index 0c36073dd..7a6346910 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
@@ -172,7 +172,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 			dictService.saveBatch(dictList.stream().peek(d -> d.setId(null)).collect(Collectors.toList()));
 			// 处理字典项最新关联的字典ID
 			List<SysDictItem> itemList = dictList.stream().flatMap(dict -> dictItemList.stream()
-					.filter(item -> item.getType().equals(dict.getDictType())).peek(item -> {
+					.filter(item -> item.getDictType().equals(dict.getDictType())).peek(item -> {
 						item.setDictId(dict.getId());
 						item.setId(null);
 					})).collect(Collectors.toList());