From e3fcc27bfdb23999a2ce1bcf718cd98062cdd870 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期一, 02 十一月 2026 09:29:37 +0800
Subject: [PATCH] fix(system): 用户导入部门改为按名称填写,修复照模板导入必然失败

---
 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java                        |    2 
 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java            |   33 ++++++++--
 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java               |   78 +++++++++++++++++++++-----
 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java |   12 +++
 4 files changed, 100 insertions(+), 25 deletions(-)

diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index b206f45..c319117 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -13,6 +13,7 @@
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.enums.common.SexEnum;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.permission.RoleService;
@@ -43,6 +44,8 @@
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_IMPORT_FILE_EMPTY;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_IMPORT_FILE_INVALID;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_POST_NOT_EMPTY;
 
 @Tag(name = "绠$悊鍚庡彴 - 鐢ㄦ埛")
@@ -222,16 +225,21 @@
     }
 
     @GetMapping("/get-import-template")
-    @Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘")
+    @Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘", description = "閮ㄩ棬鎸夐儴闂ㄥ悕绉板~鍐欙紝绀轰緥鍙栬嚜褰撳墠绯荤粺鐪熷疄閮ㄩ棬")
     public void importTemplate(HttpServletResponse response) throws IOException {
-        // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+        // 绀轰緥鍙栧綋鍓嶇湡瀹為儴闂ㄥ悕绉帮紝閬垮厤浣跨敤鑰呯収鎶勫畼鏂� demo 瀵艰嚧銆岄儴闂ㄤ笉瀛樺湪銆�
+        List<DeptDO> depts = deptService.getDeptList(new DeptListReqVO());
+        String sampleDept1 = CollUtil.isNotEmpty(depts) ? depts.get(0).getName() : "璇峰~鍐欓儴闂ㄥ悕绉�";
+        String sampleDept2 = depts.size() > 1 ? depts.get(1).getName() : sampleDept1;
+
         List<UserImportExcelVO> list = Arrays.asList(
-                UserImportExcelVO.builder().username("yunai").deptId(1L).email("yunai@iocoder.cn").mobile("15601691300")
-                        .nickname("瓒呯骇绠$悊鍛�").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
-                UserImportExcelVO.builder().username("yuanma").deptId(2L).email("yuanma@iocoder.cn").mobile("15601701300")
-                        .nickname("婧愮爜").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
+                UserImportExcelVO.builder().username("zhangsan").deptName(sampleDept1).email("zhangsan@example.com")
+                        .mobile("13800000001").nickname("寮犱笁")
+                        .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
+                UserImportExcelVO.builder().username("lisi").deptName(sampleDept2).email("lisi@example.com")
+                        .mobile("13800000002").nickname("鏉庡洓")
+                        .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
         );
-        // 杈撳嚭
         ExcelUtils.write(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
     }
 
@@ -244,7 +252,16 @@
     @PreAuthorize("@ss.hasPermission('system:user:import')")
     public CommonResult<UserImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
                                                       @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
-        List<UserImportExcelVO> list = ExcelUtils.read(file, UserImportExcelVO.class);
+        // 绌烘枃浠剁粰鍑烘槑纭彁绀猴紝閬垮厤搴曞眰寮傚父鍙樻垚銆岀郴缁熷紓甯搞��
+        if (file == null || file.isEmpty()) {
+            throw exception(USER_IMPORT_FILE_EMPTY);
+        }
+        List<UserImportExcelVO> list;
+        try {
+            list = ExcelUtils.read(file, UserImportExcelVO.class);
+        } catch (Exception ex) {
+            throw exception(USER_IMPORT_FILE_INVALID);
+        }
         return success(userService.importUserList(list, updateSupport));
     }
 
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
index f6400e1..f622bd4 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
@@ -11,6 +11,9 @@
 
 /**
  * 鐢ㄦ埛 Excel 瀵煎叆 VO
+ *
+ * 閮ㄩ棬鏀逛负鎸夈�岄儴闂ㄥ悕绉般�嶅~鍐欙細鍘熸柟妗堣姹傚~鍐欓儴闂ㄧ紪鍙凤紙鏁版嵁搴撲富閿� ID锛夛紝
+ * 浣嗛儴闂ㄧ鐞嗛〉闈㈠苟涓嶅睍绀� ID锛屼娇鐢ㄨ�呮棤浠庡緱鐭ヨ濉粈涔堬紝鐓фā鏉跨ず渚嬪~鍐欏繀鐒跺け璐ャ��
  */
 @Data
 @Builder
@@ -24,8 +27,13 @@
     @ExcelProperty("鐢ㄦ埛鍚嶇О")
     private String nickname;
 
-    @ExcelProperty("閮ㄩ棬缂栧彿")
-    private Long deptId;
+    /**
+     * 閮ㄩ棬鍚嶇О
+     *
+     * 鎸夊悕绉板尮閰嶉儴闂紱鍚屾椂鍏煎濉啓鏁板瓧锛堝巻鍙叉ā鏉跨殑閮ㄩ棬缂栧彿锛�
+     */
+    @ExcelProperty("閮ㄩ棬鍚嶇О")
+    private String deptName;
 
     @ExcelProperty("鐢ㄦ埛閭")
     private String email;
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 5af11a3..e2aada9 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -40,6 +40,8 @@
     ErrorCode USER_EMAIL_EXISTS = new ErrorCode(1_002_003_002, "閭宸茬粡瀛樺湪");
     ErrorCode USER_NOT_EXISTS = new ErrorCode(1_002_003_003, "鐢ㄦ埛涓嶅瓨鍦�");
     ErrorCode USER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_003_004, "瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛�");
+    ErrorCode USER_IMPORT_FILE_EMPTY = new ErrorCode(1_002_003_012, "璇烽�夋嫨瑕佸鍏ョ殑 Excel 鏂囦欢");
+    ErrorCode USER_IMPORT_FILE_INVALID = new ErrorCode(1_002_003_013, "Excel 鏂囦欢鏍煎紡涓嶆纭垨鍐呭鏃犳硶瑙f瀽锛岃浣跨敤绯荤粺鎻愪緵鐨勫鍏ユā鏉�");
     ErrorCode USER_PASSWORD_FAILED = new ErrorCode(1_002_003_005, "鐢ㄦ埛瀵嗙爜鏍¢獙澶辫触");
     ErrorCode USER_IS_DISABLE = new ErrorCode(1_002_003_006, "鍚嶅瓧涓恒�恵}銆戠殑鐢ㄦ埛宸茶绂佺敤");
     ErrorCode USER_POST_NOT_EMPTY = new ErrorCode(1_002_003_007, "宀椾綅涓嶈兘涓虹┖");
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
index 6099e11..22491c5 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
@@ -26,6 +26,7 @@
 import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
 import cn.iocoder.yudao.module.system.mq.producer.user.AdminUserProducer;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.dept.PostService;
 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
@@ -520,6 +521,12 @@
         if (StrUtil.isEmpty(initPassword)) {
             throw exception(USER_IMPORT_INIT_PASSWORD);
         }
+        // 1.3 棰勫姞杞介儴闂細鍚嶇О -> 閮ㄩ棬锛岀紪鍙� -> 閮ㄩ棬锛屼緵涓ょ鍐欐硶瑙f瀽
+        List<DeptDO> allDepts = deptService.getDeptList(new DeptListReqVO());
+        Map<String, DeptDO> deptByName = new HashMap<>(allDepts.size());
+        for (DeptDO dept : allDepts) {
+            deptByName.put(dept.getName().trim(), dept);
+        }
 
         // 2. 閬嶅巻锛岄�愪釜鍒涘缓 or 鏇存柊
         UserImportRespVO respVO = UserImportRespVO.builder().createUsernames(new ArrayList<>())
@@ -527,38 +534,53 @@
         AtomicInteger index = new AtomicInteger(1);
         importUsers.forEach(importUser -> {
             int currentIndex = index.getAndIncrement();
-            // 2.1.1 鏍¢獙瀛楁鏄惁绗﹀悎瑕佹眰
-            try {
-                ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class).setPassword(initPassword));
-            } catch (ConstraintViolationException ex) {
-                String key = StrUtil.blankToDefault(importUser.getUsername(), "绗� " + currentIndex + " 琛�");
-                respVO.getFailureUsernames().put(key, ex.getMessage());
+            // 鐢ㄤ簬鎶ラ敊鐨勫畾浣� key锛氫紭鍏堢櫥褰曞悕锛屽惁鍒欍�岀 N 琛屻��
+            String rowKey = StrUtil.blankToDefault(importUser.getUsername(), "绗� " + currentIndex + " 琛�");
+
+            // 2.1 瑙f瀽閮ㄩ棬锛氫紭鍏堟寜鍚嶇О锛屽吋瀹瑰巻鍙叉ā鏉垮~鐨勯儴闂ㄧ紪鍙�
+            DeptDO dept = resolveImportDept(importUser.getDeptName(), deptByName);
+            if (dept == null && StrUtil.isNotBlank(importUser.getDeptName())) {
+                respVO.getFailureUsernames().put(rowKey,
+                        "閮ㄩ棬銆�" + importUser.getDeptName().trim() + "銆嶄笉瀛樺湪锛岃濉啓閮ㄩ棬绠$悊涓殑瀹屾暣閮ㄩ棬鍚嶇О");
                 return;
             }
-            // 2.1.2 鏍¢獙锛屽垽鏂槸鍚︽湁涓嶇鍚堢殑鍘熷洜
+            Long deptId = dept != null ? dept.getId() : null;
+            importUser.setDeptName(dept != null ? dept.getName() : importUser.getDeptName());
+
+            // 2.2 鏍¢獙瀛楁鏄惁绗﹀悎瑕佹眰
             try {
-                validateUserForCreateOrUpdate(null, null, importUser.getMobile(), importUser.getEmail(),
-                        importUser.getDeptId(), null);
+                ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class)
+                        .setPassword(initPassword).setDeptId(deptId));
+            } catch (ConstraintViolationException ex) {
+                respVO.getFailureUsernames().put(rowKey, ex.getMessage());
+                return;
+            }
+            // 2.3 鏍¢獙涓氬姟绾︽潫锛堟墜鏈哄彿/閭/閮ㄩ棬鏄惁瀛樺湪锛�
+            try {
+                validateUserForCreateOrUpdate(null, null, importUser.getMobile(), importUser.getEmail(), deptId, null);
             } catch (ServiceException ex) {
-                respVO.getFailureUsernames().put(importUser.getUsername(), ex.getMessage());
+                respVO.getFailureUsernames().put(rowKey, ex.getMessage());
                 return;
             }
 
-            // 2.2.1 鍒ゆ柇濡傛灉涓嶅瓨鍦紝鍦ㄨ繘琛屾彃鍏�
+            // 2.4 鍒ゆ柇濡傛灉涓嶅瓨鍦紝鍦ㄨ繘琛屾彃鍏�
             AdminUserDO existUser = userMapper.selectByUsername(importUser.getUsername());
             if (existUser == null) {
-                userMapper.insert(BeanUtils.toBean(importUser, AdminUserDO.class)
-                        .setPassword(encodePassword(initPassword)).setPostIds(new HashSet<>())); // 璁剧疆榛樿瀵嗙爜鍙婄┖宀椾綅缂栧彿鏁扮粍
+                AdminUserDO newUser = BeanUtils.toBean(importUser, AdminUserDO.class);
+                newUser.setDeptId(deptId);
+                newUser.setPassword(encodePassword(initPassword)).setPostIds(new HashSet<>()); // 榛樿瀵嗙爜鍙婄┖宀椾綅
+                userMapper.insert(newUser);
                 respVO.getCreateUsernames().add(importUser.getUsername());
                 return;
             }
-            // 2.2.2 濡傛灉瀛樺湪锛屽垽鏂槸鍚﹀厑璁告洿鏂�
+            // 2.5 濡傛灉瀛樺湪锛屽垽鏂槸鍚﹀厑璁告洿鏂�
             if (!isUpdateSupport) {
-                respVO.getFailureUsernames().put(importUser.getUsername(), USER_USERNAME_EXISTS.getMsg());
+                respVO.getFailureUsernames().put(rowKey, USER_USERNAME_EXISTS.getMsg());
                 return;
             }
             AdminUserDO updateUser = BeanUtils.toBean(importUser, AdminUserDO.class);
             updateUser.setId(existUser.getId());
+            updateUser.setDeptId(deptId);
             userMapper.updateById(updateUser);
             respVO.getUpdateUsernames().add(importUser.getUsername());
         });
@@ -568,6 +590,32 @@
         return respVO;
     }
 
+    /**
+     * 瑙f瀽瀵煎叆琛岄噷鐨勯儴闂�
+     *
+     * 浼樺厛鎸夐儴闂ㄥ悕绉扮簿纭尮閰嶏紱鑻ュ~鍐欑殑鏄函鏁板瓧锛屽啀鎸夐儴闂ㄧ紪鍙峰尮閰嶏紙鍏煎鍘嗗彶妯℃澘锛夈��
+     *
+     * @param raw       瀵煎叆濉啓鐨勯儴闂ㄦ枃鏈�
+     * @param byName    閮ㄩ棬鍚嶇О -> 閮ㄩ棬
+     * @param byId      閮ㄩ棬缂栧彿 -> 閮ㄩ棬
+     * @return 鍖归厤鍒扮殑閮ㄩ棬锛屾湭濉啓杩斿洖 null锛屽~浜嗕絾鍖归厤涓嶅埌涔熻繑鍥� null
+     */
+    /**
+     * 瑙f瀽瀵煎叆琛岄噷鐨勯儴闂ㄥ悕绉�
+     *
+     * 鍙寜閮ㄩ棬鍚嶇О绮剧‘鍖归厤锛堜笉鍐嶅吋瀹规暟瀛楃紪鍙凤紝閬垮厤浣跨敤鑰呭~閿欏垪瀵艰嚧闈欓粯閿欓厤锛夈��
+     *
+     * @param raw    瀵煎叆濉啓鐨勯儴闂ㄥ悕绉�
+     * @param byName 閮ㄩ棬鍚嶇О -> 閮ㄩ棬
+     * @return 鍖归厤鍒扮殑閮ㄩ棬锛涙湭濉啓鎴栧尮閰嶄笉鍒拌繑鍥� null
+     */
+    private DeptDO resolveImportDept(String raw, Map<String, DeptDO> byName) {
+        if (StrUtil.isBlank(raw)) {
+            return null;
+        }
+        return byName.get(raw.trim());
+    }
+
     @Override
     public List<AdminUserDO> getUserListByStatus(Integer status) {
         return userMapper.selectListByStatus(status);

--
Gitblit v1.9.3