From 0f4aa5957957d9124e88da4490fac60da5324058 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 14 十一月 2026 10:43:34 +0800
Subject: [PATCH] fix(excel): 兼容模板表头必填星号并完善部门/岗位导入校验

---
 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
index 04ae90f..136719e 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.service.dept;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -174,7 +175,28 @@
         }
         PostImportRespVO respVO = PostImportRespVO.builder().createPostNames(new ArrayList<>())
                 .updatePostNames(new ArrayList<>()).failurePostNames(new LinkedHashMap<>()).build();
-        importPosts.forEach(importPost -> {
+        for (int i = 0; i < importPosts.size(); i++) {
+            PostImportExcelVO importPost = importPosts.get(i);
+            // 鏍¢獙蹇呭~椤癸細鍚嶇О涓虹┖浼氱敓鎴� null 鐨� Map key锛屽鑷村搷搴斿簭鍒楀寲澶辫触锛�
+            // 缂栫爜銆佹帓搴忋�佺姸鎬佷负绌轰細瑙﹀彂鏁版嵁搴撻潪绌虹害鏉燂紝鐩存帴鎶涚郴缁熷紓甯�
+            String rowLabel = StrUtil.blankToDefault(importPost.getName(), "绗� " + (i + 1) + " 鏉¤褰�");
+            if (StrUtil.isBlank(importPost.getName())) {
+                respVO.getFailurePostNames().put(rowLabel, "宀椾綅鍚嶇О涓嶈兘涓虹┖锛岃琛ュ叏 Excel 鐨勩�屽矖浣嶅悕绉般�嶅垪鍚庨噸鏂板鍏�");
+                continue;
+            }
+            if (StrUtil.isBlank(importPost.getCode())) {
+                respVO.getFailurePostNames().put(rowLabel, "宀椾綅缂栫爜涓嶈兘涓虹┖锛岃琛ュ叏 Excel 鐨勩�屽矖浣嶇紪鐮併�嶅垪鍚庨噸鏂板鍏�");
+                continue;
+            }
+            if (importPost.getSort() == null) {
+                respVO.getFailurePostNames().put(rowLabel, "宀椾綅鎺掑簭涓嶈兘涓虹┖锛岃琛ュ叏 Excel 鐨勩�屽矖浣嶆帓搴忋�嶅垪鍚庨噸鏂板鍏�");
+                continue;
+            }
+            if (importPost.getStatus() == null) {
+                respVO.getFailurePostNames().put(rowLabel, "鐘舵�佹湭濉啓鎴栦笉鏄�屽紑鍚�/鍏抽棴銆嶏紝璇峰~鍐� Excel 鐨勩�岀姸鎬併�嶅垪鍚庨噸鏂板鍏�");
+                continue;
+            }
+
             // 鏍¢獙锛屽垽鏂槸鍚︽湁涓嶇鍚堢殑鍘熷洜
             try {
                 validatePostForCreateOrUpdate(null, importPost.getName(), importPost.getCode());
@@ -184,7 +206,7 @@
                     // ignore
                 } else {
                     respVO.getFailurePostNames().put(importPost.getName(), ex.getMessage());
-                    return;
+                    continue;
                 }
             }
 
@@ -197,13 +219,13 @@
                 PostDO post = BeanUtils.toBean(importPost, PostDO.class);
                 postMapper.insert(post);
                 respVO.getCreatePostNames().add(importPost.getName());
-                return;
+                continue;
             }
 
             // 濡傛灉瀛樺湪锛屽垽鏂槸鍚﹀厑璁告洿鏂�
             if (!isUpdateSupport) {
                 respVO.getFailurePostNames().put(importPost.getName(), "宀椾綅鍚嶆垨缂栫爜宸茬粡瀛樺湪");
-                return;
+                continue;
             }
 
             // 鏇存柊宀椾綅
@@ -211,7 +233,7 @@
             updatePost.setId(existPost.getId());
             postMapper.updateById(updatePost);
             respVO.getUpdatePostNames().add(importPost.getName());
-        });
+        }
         // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
         OperateLogUtils.putImportSummary(respVO.getCreatePostNames(), respVO.getUpdatePostNames(),
                 respVO.getFailurePostNames());

--
Gitblit v1.9.3