From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DictServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DictServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DictServiceImpl.java
index d68d236..17f1c19 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DictServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DictServiceImpl.java
@@ -8,14 +8,13 @@
import com.supersavedriving.driver.modular.system.dao.DictMapper;
import com.supersavedriving.driver.modular.system.model.Dict;
import com.supersavedriving.driver.modular.system.service.IDictService;
+import com.supersavedriving.driver.core.common.constant.factory.MutiStrFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
-
-import static com.supersavedriving.driver.core.common.constant.factory.MutiStrFactory.*;
@Service
@Transactional
@@ -33,7 +32,7 @@
}
//解析dictValues
- List<Map<String, String>> items = parseKeyValue(dictValues);
+ List<Map<String, String>> items = MutiStrFactory.parseKeyValue(dictValues);
//添加字典
Dict dict = new Dict();
@@ -46,9 +45,9 @@
//添加字典条目
for (Map<String, String> item : items) {
- String code = item.get(MUTI_STR_CODE);
- String name = item.get(MUTI_STR_NAME);
- String num = item.get(MUTI_STR_NUM);
+ String code = item.get(MutiStrFactory.MUTI_STR_CODE);
+ String name = item.get(MutiStrFactory.MUTI_STR_NAME);
+ String num = item.get(MutiStrFactory.MUTI_STR_NUM);
Dict itemDict = new Dict();
itemDict.setPid(dict.getId());
itemDict.setCode(code);
--
Gitblit v1.7.1