From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index 0e06410..0f7733e 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -16,7 +16,7 @@
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.depart.UmsDepartMapper;
-import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.dict.DataDictionary2Mapper;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.utils.EasyExcelUtils;
@@ -147,7 +147,7 @@
@Resource
private UmsDepartMapper sccgDepartMapper;
@Resource
- private DataDictionaryMapper dataDictionaryMapper;
+ private DataDictionary2Mapper dataDictionary2Mapper;
@ApiOperation("閮ㄩ棬瀵煎叆")
@PostMapping("/import")
public CommonResult importDpt(MultipartFile file) throws IOException {
@@ -168,7 +168,7 @@
// 璁剧疆閮ㄩ棬鎻忚堪
umsDepart.setDepartDes(umsDepartDto.getDepartDes());
// 璁剧疆閮ㄩ棬绫诲瀷
- DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, umsDepartDto.getDepartType()));
+ DataDictionary dataDictionary = dataDictionary2Mapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, umsDepartDto.getDepartType()));
if (Objects.isNull(dataDictionary)){
throw new RuntimeException("閮ㄩ棬绫诲瀷涓嶅瓨鍦�");
}else {
--
Gitblit v1.8.0