From 2078aee230bc109d66da296da8b7f24377befa1b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 20 十二月 2024 11:08:44 +0800
Subject: [PATCH] 1
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..e66f4a3 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 {
@@ -238,9 +238,10 @@
@ApiOperation("鏌ヨ閮ㄩ棬浜岀骇")
@GetMapping(value = "/query_father_children")
- public CommonResult search(@RequestParam Integer fatherId) {
+ public CommonResult search(@RequestParam String fatherId) {
+ long fatherIdLong = Long.parseLong(fatherId);
return CommonResult.success(departService
.list(new LambdaQueryWrapper<UmsDepart>()
- .eq(UmsDepart::getParentId, fatherId)));
+ .eq(UmsDepart::getParentId, fatherIdLong)));
}
}
\ No newline at end of file
--
Gitblit v1.8.0