From a1b0e5c618b9cd1c2521be14beec70321232ec1d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 11 十二月 2023 14:27:55 +0800
Subject: [PATCH] 删除注释
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 d2c0283..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;
@@ -141,13 +141,13 @@
public void exportDpt(HttpServletResponse response) {
List<UmsDepartDto> umsDepartDtos = departService.departExp();
String sheetName = "閮ㄩ棬瀵煎嚭";
- EasyExcelUtils.export(response, sheetName, UmsDepartDto.class, umsDepartDtos);
+ EasyExcelUtils.export1(response, sheetName, UmsDepartDto.class, umsDepartDtos, "閮ㄩ棬瀵煎嚭");
}
@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