From e8a0f05f99f33fa05085536541da6bc27e66a644 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 14 四月 2023 14:57:55 +0800
Subject: [PATCH] bug修改

---
 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index fc838c5..3796ae0 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -18,7 +18,7 @@
 import com.ycl.entity.user.UmsAdmin;
 import com.ycl.entity.user.UmsRole;
 import com.ycl.mapper.depart.UmsDepartMapper;
-import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.dict.DataDictionary2Mapper;
 import com.ycl.mapper.user.UmsAdminMapper;
 import com.ycl.mapper.user.UmsRoleMapper;
 import com.ycl.service.redis.RedisService;
@@ -150,7 +150,7 @@
     public void exportUser(HttpServletResponse response) {
         List<UmsUserDto1> umsUserDtos = adminService.userExp();
         String sheetName = "鐢ㄦ埛瀵煎嚭";
-        EasyExcelUtils.export(response, sheetName, UmsUserDto1.class, umsUserDtos);
+        EasyExcelUtils.export1(response, sheetName, UmsUserDto1.class, umsUserDtos, "鐢ㄦ埛瀵煎嚭");
     }
 
     @Resource
@@ -158,7 +158,7 @@
     @Resource
     private UmsAdminMapper umsAdminMapper;
     @Resource
-    private DataDictionaryMapper dataDictionaryMapper;
+    private DataDictionary2Mapper dataDictionary2Mapper;
     @Resource
     private UmsDepartMapper umsDepartMapper;
     @ApiOperation("鐢ㄦ埛瀵煎叆")
@@ -206,7 +206,7 @@
                         }
 
                         String userType = item.getUserType();
-                        DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, userType));
+                        DataDictionary dataDictionary = dataDictionary2Mapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, userType));
                         if (Objects.isNull(dataDictionary)){
                             throw new RuntimeException("鐢ㄦ埛绫诲瀷涓嶅瓨鍦�");
                         }else {

--
Gitblit v1.8.0