✨ 认证退出与操作日志、密码规则，以及运输业务多项修正

fd6563f 为 LenientDateParser 引入的 blade-starter-log（compile scope）
把 blade-core-tool 等整棵依赖树传递给所有依赖 common 的模块。网关
(WebFlux) 的 pom 排除了 spring-boot-starter-web（无 spring-webmvc），
而 blade-core-tool 的自动配置 BladeConverterConfiguration implements
WebMvcConfigurer 且无 @ConditionalOnClass 守卫，Spring 解析该配置类时
抛 FileNotFoundException 导致网关启动即崩。

修复：starter-log 改为 provided —— 编译期 ServiceException 可见，
不再向下游传递。业务服务运行时的 ServiceException 由 blade-core-boot
传递提供，行为不变。

验证：网关以原 classpath 启动成功（Started GateWayApplication in
16.4s）；blade-common 与全仓 BUILD SUCCESS。

blade-auth/src/main/java/org/springblade/auth/config/BladeAuthConfiguration.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.auth.config;
 
+import org.springblade.auth.filter.LogoutLogFilter;
 import org.springblade.auth.granter.IamAwareTokenGranterFactory;
 import org.springblade.auth.handler.BladeAuthorizationHandler;
 import org.springblade.auth.handler.BladeLockHandler;
@@ -53,9 +54,11 @@ import org.springblade.core.tenant.BladeTenantProperties;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.Ordered;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import java.util.List;
@@ -88,6 +91,16 @@ public class BladeAuthConfiguration {
 		return new BladeLogHandler(authLogClient, bladeProperties, serverInfo);
 	}
 
+	@Bean
+	public FilterRegistrationBean<LogoutLogFilter> logoutLogFilter(BladeLogHandler logHandler) {
+		FilterRegistrationBean<LogoutLogFilter> registration = new FilterRegistrationBean<>();
+		registration.setFilter(new LogoutLogFilter(logHandler));
+		registration.addUrlPatterns("/*");
+		registration.setName("logoutLogFilter");
+		registration.setOrder(Ordered.LOWEST_PRECEDENCE - 100);
+		return registration;
+	}
+
 	@Bean
 	public PasswordHandler passwordHandler(OAuth2Properties properties) {
 		return new BladePasswordHandler(properties);

blade-auth/src/main/java/org/springblade/auth/filter/LogoutLogFilter.java

@@ -0,0 +1,80 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.auth.filter;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springblade.auth.handler.BladeLogHandler;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.core.Ordered;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+
+/**
+ * 退出登录日志过滤器
+ * 在清除 Token 前解析当前用户并异步写入认证日志
+ *
+ * @author BladeX
+ */
+@RequiredArgsConstructor
+public class LogoutLogFilter extends OncePerRequestFilter implements Ordered {
+
+	private static final String LOGOUT_PATH = "/oauth/logout";
+
+	private final BladeLogHandler logHandler;
+
+	@Override
+	protected boolean shouldNotFilter(HttpServletRequest request) {
+		String path = request.getRequestURI();
+		return StringUtil.isBlank(path) || !path.contains(LOGOUT_PATH);
+	}
+
+	@Override
+	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+		throws ServletException, IOException {
+		// 必须在 logout 清 token 之前取用户，否则无法关联账号
+		BladeUser user = AuthUtil.getUser();
+		try {
+			filterChain.doFilter(request, response);
+		} finally {
+			if (user != null) {
+				logHandler.handleLogoutLog(user, request);
+			}
+		}
+	}
+
+	@Override
+	public int getOrder() {
+		return Ordered.LOWEST_PRECEDENCE - 100;
+	}
+
+}

blade-auth/src/main/java/org/springblade/auth/handler/BladeLogHandler.java

@@ -29,12 +29,15 @@ import org.springblade.core.launch.props.BladeProperties;
 import org.springblade.core.launch.server.ServerInfo;
 import org.springblade.core.oauth2.provider.OAuth2Request;
 import org.springblade.core.oauth2.service.OAuth2User;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.core.tool.utils.WebUtil;
-import org.springblade.system.pojo.entity.AuthLog;
 import org.springblade.system.feign.IAuthLogClient;
+import org.springblade.system.pojo.entity.AuthLog;
 
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -42,7 +45,7 @@ import java.util.concurrent.CompletableFuture;
 
 /**
  * 认证日志处理器
- * 在用户认证成功时异步记录登录日志
+ * 在用户认证成功/退出时异步记录登录、退出日志
  *
  * @author BladeX
  */
@@ -50,6 +53,11 @@ import java.util.concurrent.CompletableFuture;
 @RequiredArgsConstructor
 public class BladeLogHandler {
 
+	/**
+	 * 退出登录授权类型标识
+	 */
+	public static final String GRANT_TYPE_LOGOUT = "logout";
+
 	private final IAuthLogClient authLogClient;
 	private final BladeProperties bladeProperties;
 	private final ServerInfo serverInfo;
@@ -72,6 +80,26 @@ public class BladeLogHandler {
 		});
 	}
 
+	/**
+	 * 记录退出登录日志
+	 *
+	 * @param user    当前登录用户
+	 * @param request HTTP 请求
+	 */
+	public void handleLogoutLog(BladeUser user, HttpServletRequest request) {
+		if (user == null) {
+			return;
+		}
+		CompletableFuture.runAsync(() -> {
+			try {
+				AuthLog authLog = buildLogoutLog(user, request);
+				authLogClient.saveAuthLog(authLog);
+			} catch (Exception exception) {
+				log.error("记录退出日志异常：{}", exception.getMessage(), exception);
+			}
+		});
+	}
+
 	/**
 	 * 构建认证日志实体
 	 *
@@ -96,4 +124,38 @@ public class BladeLogHandler {
 		return authLog;
 	}
 
+	/**
+	 * 构建退出日志实体
+	 *
+	 * @param user    当前登录用户
+	 * @param request HTTP 请求
+	 * @return AuthLog
+	 */
+	private AuthLog buildLogoutLog(BladeUser user, HttpServletRequest request) {
+		AuthLog authLog = new AuthLog();
+		authLog.setUserId(user.getUserId());
+		authLog.setTenantId(user.getTenantId());
+		authLog.setServiceId(bladeProperties.getName());
+		authLog.setServerIp(serverInfo.getIpWithPort());
+		authLog.setServerHost(serverInfo.getHostName());
+		authLog.setEnv(bladeProperties.getEnv());
+		authLog.setAccount(user.getAccount());
+		authLog.setRealName(resolveRealName(user));
+		authLog.setGrantType(GRANT_TYPE_LOGOUT);
+		authLog.setRemoteIp(WebUtil.getIP(request));
+		authLog.setUserAgent(WebUtil.getUserAgent(request));
+		authLog.setLoginTime(DateUtil.now());
+		return authLog;
+	}
+
+	private String resolveRealName(BladeUser user) {
+		if (StringUtil.isNotBlank(user.getNickName())) {
+			return user.getNickName();
+		}
+		if (StringUtil.isNotBlank(user.getUserName())) {
+			return user.getUserName();
+		}
+		return user.getAccount();
+	}
+
 }

blade-common/pom.xml

@@ -22,6 +22,25 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-loadbalancer</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-log</artifactId>
+            <!-- provided：LenientDateParser 编译期需要 ServiceException（位于 starter-log），
+                 但 provided 不向下游传递——否则网关会经 common 拿到 blade-core-tool 的
+                 BladeConverterConfiguration（implements WebMvcConfigurer），在无 spring-webmvc
+                 的 WebFlux 网关里启动即崩。业务服务经 blade-core-boot 自带 starter-log，运行时不受影响。 -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-auto</artifactId>

blade-common/src/main/java/org/springblade/common/aspect/OperationApiLogAspect.java

@@ -0,0 +1,145 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.common.aspect;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.constant.EventConstant;
+import org.springblade.core.log.event.ApiLogEvent;
+import org.springblade.core.log.model.LogApi;
+import org.springblade.core.log.utils.LogAbstractUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.WebUtil;
+import org.springframework.core.annotation.AnnotationUtils;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 增删改操作日志切面
+ * 自动拦截 Controller 中的 save/submit/update/remove/delete 等方法，写入 blade_log_api
+ * 已标注 {@link ApiLog} 的方法跳过，避免重复记录
+ *
+ * @author BladeX
+ */
+@Slf4j
+@Aspect
+public class OperationApiLogAspect {
+
+	@Around("""
+		execution(* org.springblade..controller..*.save*(..))
+		|| execution(* org.springblade..controller..*.submit*(..))
+		|| execution(* org.springblade..controller..*.update*(..))
+		|| execution(* org.springblade..controller..*.remove*(..))
+		|| execution(* org.springblade..controller..*.delete*(..))
+		""")
+	public Object around(ProceedingJoinPoint point) throws Throwable {
+		MethodSignature signature = (MethodSignature) point.getSignature();
+		Method method = signature.getMethod();
+		if (!shouldRecord(method)) {
+			return point.proceed();
+		}
+
+		String className = point.getTarget().getClass().getName();
+		String methodName = method.getName();
+		String title = resolveTitle(point.getTarget().getClass(), method);
+		long beginTime = System.currentTimeMillis();
+		Object result = point.proceed();
+		long time = System.currentTimeMillis() - beginTime;
+		try {
+			publishEvent(methodName, className, title, time);
+		} catch (Exception e) {
+			log.warn("记录操作日志失败: {}#{} - {}", className, methodName, e.getMessage());
+		}
+		return result;
+	}
+
+	private boolean shouldRecord(Method method) {
+		if (method.getAnnotation(ApiLog.class) != null) {
+			return false;
+		}
+		HttpServletRequest request = WebUtil.getRequest();
+		if (request == null) {
+			return true;
+		}
+		String httpMethod = request.getMethod();
+		return !"GET".equalsIgnoreCase(httpMethod)
+			&& !"HEAD".equalsIgnoreCase(httpMethod)
+			&& !"OPTIONS".equalsIgnoreCase(httpMethod);
+	}
+
+	private String resolveTitle(Class<?> targetClass, Method method) {
+		Tag tag = AnnotationUtils.findAnnotation(targetClass, Tag.class);
+		Operation operation = AnnotationUtils.findAnnotation(method, Operation.class);
+		String module = tag == null ? null : firstNonBlank(tag.name(), tag.description());
+		String action = operation == null ? null : firstNonBlank(operation.summary(), operation.description());
+		if (StringUtil.isNotBlank(module) && StringUtil.isNotBlank(action)) {
+			return module + "-" + action;
+		}
+		if (StringUtil.isNotBlank(action)) {
+			return action;
+		}
+		String simpleName = targetClass.getSimpleName().replace("Controller", "");
+		return simpleName + "-" + method.getName();
+	}
+
+	private String firstNonBlank(String... values) {
+		if (values == null) {
+			return null;
+		}
+		for (String value : values) {
+			if (StringUtil.isNotBlank(value)) {
+				return value.trim();
+			}
+		}
+		return null;
+	}
+
+	private void publishEvent(String methodName, String methodClass, String title, long time) {
+		HttpServletRequest request = WebUtil.getRequest();
+		LogApi logApi = new LogApi();
+		logApi.setType(BladeConstant.LOG_NORMAL_TYPE);
+		logApi.setTitle(title);
+		logApi.setTime(String.valueOf(time));
+		logApi.setMethodClass(methodClass);
+		logApi.setMethodName(methodName);
+		LogAbstractUtil.addRequestInfoToLog(request, logApi);
+		Map<String, Object> event = new HashMap<>(16);
+		event.put(EventConstant.EVENT_LOG, logApi);
+		SpringUtil.publishEvent(new ApiLogEvent(event));
+	}
+
+}

blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java

@@ -26,16 +26,27 @@
 package org.springblade.common.config;
 
 
-import lombok.AllArgsConstructor;
-import org.springframework.context.annotation.Configuration;
+import org.springblade.common.aspect.OperationApiLogAspect;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Bean;
 
 /**
  * 公共封装包配置类
  *
  * @author Chill
  */
-@Configuration(proxyBeanMethods = false)
-@AllArgsConstructor
+@AutoConfiguration
 public class BladeCommonConfiguration {
 
+	@Bean
+	@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
+	@ConditionalOnClass(name = "org.springblade.core.log.event.ApiLogEvent")
+	@ConditionalOnProperty(value = "blade.log.operation.enabled", havingValue = "true", matchIfMissing = true)
+	public OperationApiLogAspect operationApiLogAspect() {
+		return new OperationApiLogAspect();
+	}
+
 }

blade-common/src/main/java/org/springblade/common/excel/ImportFailureExcelUtil.java

@@ -46,9 +46,11 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * 导入失败明细 Excel 导出工具类
@@ -95,7 +97,7 @@ public class ImportFailureExcelUtil {
 	 * @param excelClass 原导入 Excel 类型
 	 */
 	public static void export(HttpServletResponse response, String fileName, String sheetName, List<?> data, Class<?> excelClass) {
-		exportFailureReasonOnly(response, fileName, sheetName, data, excelClass);
+		export(response, fileName, sheetName, data, excelClass, true);
 	}
 
 	/**
@@ -109,6 +111,16 @@ public class ImportFailureExcelUtil {
 	 */
 	public static void exportFailureReasonOnly(HttpServletResponse response, String fileName, String sheetName,
 											   List<?> data, Class<?> excelClass) {
+		export(response, fileName, sheetName, data, excelClass, false);
+	}
+
+	/**
+	 * 导出导入失败明细
+	 *
+	 * @param markErrorColumns 是否按失败原因里出现的列名，标红对应字段单元格
+	 */
+	private static void export(HttpServletResponse response, String fileName, String sheetName,
+							   List<?> data, Class<?> excelClass, boolean markErrorColumns) {
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding(StandardCharsets.UTF_8.name());
 		String encodeFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8);
@@ -118,7 +130,7 @@ public class ImportFailureExcelUtil {
 		List<List<Object>> rows = buildRows(data, excelFields);
 		try {
 			FastExcel.write(response.getOutputStream())
-				.registerWriteHandler(new ImportFailureCellStyleHandler(excelFields.size()))
+				.registerWriteHandler(new ImportFailureCellStyleHandler(excelFields, rows, markErrorColumns))
 				.head(head)
 				.sheet(sheetName)
 				.doWrite(rows);
@@ -204,15 +216,59 @@ public class ImportFailureExcelUtil {
 		throw new NoSuchFieldException(String.join(",", fieldNames));
 	}
 
+	/**
+	 * 文本归一化：去掉空白、星号与中英文标点并统一小写
+	 * <p>
+	 * 目的是让「失败原因里写的列名」与「表头列名」能直接做包含匹配，
+	 * 不受「*」「/」「：」等写法差异影响。
+	 */
+	private static String normalize(String value) {
+		return value == null ? "" : value.replaceAll("[\\s*_：:，,。；;（）()\\[\\]【】<>《》/／、-]", "").toLowerCase();
+	}
+
+	/**
+	 * 取某一列用于定位的候选关键词
+	 * <p>
+	 * 包含表头列名、字段名，以及列名按分隔符拆出的片段
+	 * （如「车牌号/船号」拆出「车牌号」「船号」，失败原因只写其中一段时也能定位）。
+	 */
+	private static List<String> columnKeywords(Field field) {
+		ExcelProperty excelProperty = field.getAnnotation(ExcelProperty.class);
+		String[] value = excelProperty.value();
+		String columnName = value.length == 0 ? field.getName() : value[0];
+		List<String> keywords = new ArrayList<>();
+		keywords.add(columnName);
+		keywords.add(field.getName());
+		keywords.addAll(Arrays.asList(columnName.replace("*", "").split("[/／、（）()\\s]+")));
+		return keywords.stream()
+			.map(ImportFailureExcelUtil::normalize)
+			.filter(keyword -> keyword.length() >= 2)
+			.distinct()
+			.toList();
+	}
+
 	private static class ImportFailureCellStyleHandler implements CellWriteHandler {
 
 		private final int failureReasonColumnIndex;
+		private final boolean markErrorColumns;
+		private final List<List<Object>> rows;
+		private final Map<Integer, Set<Integer>> redColumnsByRow = new HashMap<>();
 		private final Map<Short, CellStyle> redStyleCache = new HashMap<>();
 		private final Map<Short, CellStyle> noWrapStyleCache = new HashMap<>();
 		private final Map<Integer, Integer> columnWidthCache = new HashMap<>();
 
-		private ImportFailureCellStyleHandler(int failureReasonColumnIndex) {
-			this.failureReasonColumnIndex = failureReasonColumnIndex;
+		private ImportFailureCellStyleHandler(List<Field> excelFields, List<List<Object>> rows, boolean markErrorColumns) {
+			this.failureReasonColumnIndex = excelFields.size();
+			this.markErrorColumns = markErrorColumns;
+			this.rows = rows;
+			if (markErrorColumns) {
+				List<List<String>> columnKeywords = excelFields.stream()
+					.map(ImportFailureExcelUtil::columnKeywords)
+					.toList();
+				for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
+					redColumnsByRow.put(rowIndex, resolveRedColumns(rows.get(rowIndex), columnKeywords));
+				}
+			}
 		}
 
 		@Override
@@ -230,11 +286,83 @@ public class ImportFailureExcelUtil {
 				return;
 			}
 			adjustColumnWidth(cell);
-			if (cell.getColumnIndex() == failureReasonColumnIndex) {
+			if (relativeRowIndex == null || relativeRowIndex < 0 || relativeRowIndex >= rows.size()) {
+				return;
+			}
+			if (shouldMarkRed(relativeRowIndex, cell.getColumnIndex())) {
 				markRed(cell);
 			}
 		}
 
+		/**
+		 * 计算某一行需要标红的列
+		 * <p>
+		 * 失败原因里出现的列名即视为出错列；但当某个命中片段被另一列更长的命中
+		 * 片段完全覆盖时（如原因「车船类型不能为空」同时命中「车船类型」和它的
+		 * 子串「类型」），只保留更长的那一列，避免把无关列一起标红。
+		 */
+		private Set<Integer> resolveRedColumns(List<Object> row, List<List<String>> columnKeywords) {
+			Set<Integer> redColumns = new LinkedHashSet<>();
+			redColumns.add(failureReasonColumnIndex);
+			String failureReason = normalize(String.valueOf(row.get(failureReasonColumnIndex)));
+			if (failureReason.isEmpty()) {
+				return redColumns;
+			}
+			List<int[]> matches = new ArrayList<>();
+			for (int column = 0; column < columnKeywords.size(); column++) {
+				for (String keyword : columnKeywords.get(column)) {
+					int fromIndex = 0;
+					while (true) {
+						int index = failureReason.indexOf(keyword, fromIndex);
+						if (index < 0) {
+							break;
+						}
+						matches.add(new int[]{index, index + keyword.length(), column});
+						fromIndex = index + 1;
+					}
+				}
+			}
+			for (int[] match : matches) {
+				if (!isSubsumed(match, matches)) {
+					redColumns.add(match[2]);
+				}
+			}
+			return redColumns;
+		}
+
+		/**
+		 * 判断该命中片段是否被另一列更长的命中片段完全覆盖
+		 */
+		private boolean isSubsumed(int[] match, List<int[]> matches) {
+			int matchLength = match[1] - match[0];
+			for (int[] other : matches) {
+				if (other[2] == match[2]) {
+					continue;
+				}
+				if ((other[1] - other[0]) > matchLength && other[0] <= match[0] && other[1] >= match[1]) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		private boolean shouldMarkRed(int rowIndex, int columnIndex) {
+			if (columnIndex == failureReasonColumnIndex) {
+				return true;
+			}
+			if (!markErrorColumns) {
+				return false;
+			}
+			Set<Integer> redColumns = redColumnsByRow.get(rowIndex);
+			return redColumns != null && redColumns.contains(columnIndex);
+		}
+
+		/**
+		 * 标红单元格
+		 * <p>
+		 * 统一只改字体颜色，不加底纹；空单元格的红色字体在屏幕上不可见，
+		 * 这类错误依靠失败原因列的文字定位。
+		 */
 		private void markRed(Cell cell) {
 			CellStyle currentStyle = cell.getCellStyle();
 			CellStyle redStyle = redStyleCache.computeIfAbsent(currentStyle.getIndex(), styleIndex -> {

blade-common/src/main/java/org/springblade/common/excel/LenientDateParser.java

@@ -0,0 +1,198 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.common.excel;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 批量导入宽容日期解析器（口径见根工作区 docs/import-spec.md）。
+ * <p>
+ * 解析规则：
+ * <ul>
+ * <li>分隔符 {@code -}、{@code /}、{@code .} 均接受；补零与否均可（2026-08-02 ≡ 2026-8-2）</li>
+ * <li>日期时间：日期部分同上，时间 HH:mm:ss，可省略秒或秒+分（2026-8-2 12:3 可解析）</li>
+ * <li>拒绝：两位年份（26-8-2）、日在前（2/8/2026）、无分隔符（20260802）</li>
+ * </ul>
+ *
+ * @author Chill
+ */
+public final class LenientDateParser {
+
+	/**
+	 * 日期部分：4 位年 + 分隔符 + 1~2 位月 + 同一分隔符 + 1~2 位日（年在前，拒绝两位年份与日在前）。
+	 */
+	private static final Pattern DATE_PATTERN = Pattern.compile("(\\d{4})([-/.])(\\d{1,2})\\2(\\d{1,2})");
+
+	/**
+	 * 时间部分：1~2 位时[:1~2 位分[:1~2 位秒]]，逐级可省略。
+	 */
+	private static final Pattern TIME_PATTERN = Pattern.compile("(\\d{1,2})(?::(\\d{1,2})(?::(\\d{1,2}))?)?");
+
+	private LenientDateParser() {
+	}
+
+	/**
+	 * 解析日期文本，失败返回 {@code null}。
+	 *
+	 * @param value 单元格原始文本
+	 * @return 日期；无法识别时返回 null
+	 */
+	public static LocalDate parseDateOrNull(String value) {
+		String normalized = normalize(value);
+		if (normalized == null) {
+			return null;
+		}
+		Matcher matcher = DATE_PATTERN.matcher(normalized);
+		if (!matcher.matches()) {
+			return null;
+		}
+		try {
+			return LocalDate.of(Integer.parseInt(matcher.group(1)),
+				Integer.parseInt(matcher.group(3)), Integer.parseInt(matcher.group(4)));
+		} catch (NumberFormatException | java.time.DateTimeException exception) {
+			return null;
+		}
+	}
+
+	/**
+	 * 解析日期文本；允许携带合法时间部分并截断（如 2026-9-1 8:0:0 按 2026-09-01 解析，
+	 * 与 fastexcel 内置 LocalDate 转换的既有宽容度保持一致），失败返回 {@code null}。
+	 *
+	 * @param value 单元格原始文本
+	 * @return 日期；无法识别时返回 null
+	 */
+	public static LocalDate parseDateLenientlyOrNull(String value) {
+		LocalDate date = parseDateOrNull(value);
+		if (date != null) {
+			return date;
+		}
+		LocalDateTime dateTime = parseDateTimeOrNull(value);
+		return dateTime == null ? null : dateTime.toLocalDate();
+	}
+
+	/**
+	 * 解析日期时间文本；纯日期按当日零点处理，失败返回 {@code null}。
+	 *
+	 * @param value 单元格原始文本
+	 * @return 日期时间；无法识别时返回 null
+	 */
+	public static LocalDateTime parseDateTimeOrNull(String value) {
+		String normalized = normalize(value);
+		if (normalized == null) {
+			return null;
+		}
+		// 拆出日期与时间两部分；中间允许 1 个及以上空白或小写 t（2026-8-2t12:3 亦接受）。
+		String[] parts = normalized.split("[ \\t]+|(?<=\\d)t", 2);
+		if (parts.length == 0) {
+			return null;
+		}
+		LocalDate date = parseDateOrNull(parts[0]);
+		if (date == null) {
+			return null;
+		}
+		if (parts.length == 1) {
+			return date.atStartOfDay();
+		}
+		Matcher matcher = TIME_PATTERN.matcher(parts[1]);
+		if (!matcher.matches()) {
+			return null;
+		}
+		try {
+			int hour = Integer.parseInt(matcher.group(1));
+			int minute = matcher.group(2) == null ? 0 : Integer.parseInt(matcher.group(2));
+			int second = matcher.group(3) == null ? 0 : Integer.parseInt(matcher.group(3));
+			return LocalDateTime.of(date, LocalTime.of(hour, minute, second));
+		} catch (NumberFormatException | java.time.DateTimeException exception) {
+			return null;
+		}
+	}
+
+	/**
+	 * 解析日期文本，失败抛出携带口径文案的 {@link org.springblade.core.log.exception.ServiceException}。
+	 * 空白与 {@code null} 返回 {@code null}（可选字段由业务校验决定是否必填）。
+	 *
+	 * @param value      单元格原始文本
+	 * @param columnName 导入模板列名（用于失败原因文案与失败明细标红定位）
+	 * @return 日期
+	 */
+	public static LocalDate parseDate(String value, String columnName) {
+		if (value == null || value.trim().isEmpty()) {
+			return null;
+		}
+		LocalDate date = parseDateLenientlyOrNull(value);
+		if (date == null) {
+			throw unrecognizedDate(value, columnName);
+		}
+		return date;
+	}
+
+	/**
+	 * 解析日期时间文本，失败抛出携带口径文案的 {@link org.springblade.core.log.exception.ServiceException}。
+	 * 空白与 {@code null} 返回 {@code null}（可选字段由业务校验决定是否必填）。
+	 *
+	 * @param value      单元格原始文本
+	 * @param columnName 导入模板列名（用于失败原因文案与失败明细标红定位）
+	 * @return 日期时间
+	 */
+	public static LocalDateTime parseDateTime(String value, String columnName) {
+		if (value == null || value.trim().isEmpty()) {
+			return null;
+		}
+		LocalDateTime dateTime = parseDateTimeOrNull(value);
+		if (dateTime == null) {
+			throw unrecognizedDate(value, columnName);
+		}
+		return dateTime;
+	}
+
+	/**
+	 * 按口径构造「日期格式无法识别」错误。
+	 *
+	 * @param value      单元格原始文本
+	 * @param columnName 导入模板列名
+	 * @return 业务异常
+	 */
+	public static org.springblade.core.log.exception.ServiceException unrecognizedDate(String value, String columnName) {
+		String displayName = columnName == null || columnName.isBlank() ? "日期" : columnName;
+		return new org.springblade.core.log.exception.ServiceException(
+			displayName + " 日期格式无法识别：" + (value == null ? "" : value.trim()));
+	}
+
+	/**
+	 * 归一化输入：去首尾空白，跳过空白值。
+	 */
+	private static String normalize(String value) {
+		if (value == null) {
+			return null;
+		}
+		String normalized = value.trim();
+		return normalized.isEmpty() ? null : normalized;
+	}
+
+}

blade-common/src/main/java/org/springblade/common/excel/LenientDateStringConverter.java

@@ -0,0 +1,75 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.common.excel;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+import cn.idev.excel.util.DateUtils;
+
+import java.time.LocalDate;
+
+/**
+ * 批量导入宽容日期转换器（String 承载）：Excel 数值日期（序列号）转 ISO 文本，文本原样透传。
+ * <p>
+ * 文本的宽容解析由服务层调用 {@link LenientDateParser} 完成，不在此处抛错——
+ * 转换器阶段抛出的异常会被 fastexcel 包装成 ExcelDataConvertException 直接中断读取，
+ * 无法进入导入失败明细流程。口径见根工作区 docs/import-spec.md。
+ *
+ * @author Chill
+ */
+public class LenientDateStringConverter implements Converter<String> {
+
+	@Override
+	public Class<?> supportJavaTypeKey() {
+		return String.class;
+	}
+
+	@Override
+	public CellDataTypeEnum supportExcelTypeKey() {
+		return CellDataTypeEnum.STRING;
+	}
+
+	@Override
+	public String convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
+		GlobalConfiguration globalConfiguration) {
+		if (cellData.getType() == CellDataTypeEnum.NUMBER) {
+			LocalDate date = DateUtils.getLocalDateTime(cellData.getNumberValue().doubleValue(),
+				globalConfiguration.getUse1904windowing()).toLocalDate();
+			return date.toString();
+		}
+		return cellData.getStringValue();
+	}
+
+	@Override
+	public WriteCellData<?> convertToExcelData(String value, ExcelContentProperty contentProperty,
+		GlobalConfiguration globalConfiguration) {
+		return new WriteCellData<>(value);
+	}
+
+}

blade-common/src/main/java/org/springblade/common/excel/LenientDateTimeStringConverter.java

@@ -0,0 +1,82 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.common.excel;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+import cn.idev.excel.util.DateUtils;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 批量导入宽容日期时间转换器（String 承载）：Excel 数值日期（序列号）转
+ * {@code yyyy-MM-dd HH:mm:ss} 文本，文本原样透传。
+ * <p>
+ * 文本的宽容解析由服务层调用 {@link LenientDateParser} 完成，不在此处抛错——
+ * 转换器阶段抛出的异常会被 fastexcel 包装成 ExcelDataConvertException 直接中断读取，
+ * 无法进入导入失败明细流程。口径见根工作区 docs/import-spec.md。
+ *
+ * @author Chill
+ */
+public class LenientDateTimeStringConverter implements Converter<String> {
+
+	/**
+	 * 数值日期序列号转文本的输出格式，与导入模板展示格式保持一致。
+	 */
+	private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+	@Override
+	public Class<?> supportJavaTypeKey() {
+		return String.class;
+	}
+
+	@Override
+	public CellDataTypeEnum supportExcelTypeKey() {
+		return CellDataTypeEnum.STRING;
+	}
+
+	@Override
+	public String convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
+		GlobalConfiguration globalConfiguration) {
+		if (cellData.getType() == CellDataTypeEnum.NUMBER) {
+			LocalDateTime dateTime = DateUtils.getLocalDateTime(cellData.getNumberValue().doubleValue(),
+				globalConfiguration.getUse1904windowing());
+			return dateTime.format(DATE_TIME_FORMATTER);
+		}
+		return cellData.getStringValue();
+	}
+
+	@Override
+	public WriteCellData<?> convertToExcelData(String value, ExcelContentProperty contentProperty,
+		GlobalConfiguration globalConfiguration) {
+		return new WriteCellData<>(value);
+	}
+
+}

blade-common/src/main/java/org/springblade/common/utils/PasswordRuleUtil.java

@@ -0,0 +1,106 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.common.utils;
+
+import org.springblade.core.tool.utils.StringUtil;
+
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * 登录密码强度规则工具
+ * 规则：大于8位，同时包含字母、数字、特殊字符（.!@#$%^&*）
+ *
+ * @author BladeX
+ */
+public final class PasswordRuleUtil {
+
+	/**
+	 * 允许的特殊字符集合
+	 */
+	public static final String SPECIAL_CHARS = ".!@#$%^&*";
+
+	/**
+	 * 最小长度（大于 8 位 => 至少 9 位）
+	 */
+	public static final int MIN_LENGTH = 9;
+
+	/**
+	 * 自动生成密码长度
+	 */
+	public static final int GENERATE_LENGTH = 10;
+
+	/**
+	 * 规则提示文案
+	 */
+	public static final String RULE_MESSAGE = "密码须大于8位，且同时包含字母、数字和特殊字符（.!@#$%^&*）";
+
+	private static final String LETTERS = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+	private static final String DIGITS = "23456789";
+	private static final String ALL_CHARS = LETTERS + DIGITS + SPECIAL_CHARS;
+	private static final Pattern PASSWORD_PATTERN = Pattern.compile(
+		"^(?=.*[A-Za-z])(?=.*\\d)(?=.*[.!@#$%^&*]).{" + MIN_LENGTH + ",}$"
+	);
+	private static final SecureRandom SECURE_RANDOM = new SecureRandom();
+
+	private PasswordRuleUtil() {
+	}
+
+	/**
+	 * 校验密码是否符合强度规则
+	 *
+	 * @param password 明文密码
+	 * @return true-符合
+	 */
+	public static boolean isValid(String password) {
+		return StringUtil.isNotBlank(password) && PASSWORD_PATTERN.matcher(password).matches();
+	}
+
+	/**
+	 * 生成符合规则的随机密码
+	 *
+	 * @return 随机密码
+	 */
+	public static String generate() {
+		List<Character> chars = new ArrayList<>(GENERATE_LENGTH);
+		chars.add(LETTERS.charAt(SECURE_RANDOM.nextInt(LETTERS.length())));
+		chars.add(DIGITS.charAt(SECURE_RANDOM.nextInt(DIGITS.length())));
+		chars.add(SPECIAL_CHARS.charAt(SECURE_RANDOM.nextInt(SPECIAL_CHARS.length())));
+		for (int i = chars.size(); i < GENERATE_LENGTH; i++) {
+			chars.add(ALL_CHARS.charAt(SECURE_RANDOM.nextInt(ALL_CHARS.length())));
+		}
+		Collections.shuffle(chars, SECURE_RANDOM);
+		StringBuilder password = new StringBuilder(GENERATE_LENGTH);
+		for (Character ch : chars) {
+			password.append(ch);
+		}
+		return password.toString();
+	}
+
+}

blade-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.springblade.common.config.BladeCommonConfiguration

blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java

@@ -63,6 +63,10 @@ public class AuthProvider {
 		DEFAULT_SKIP_URL.add("/manager/check-upload");
 		DEFAULT_SKIP_URL.add("/assets/**");
 		DEFAULT_SKIP_URL.add("/iam/sso/token/**");
+		DEFAULT_SKIP_URL.add("/blade-transport/customer-archive/public/**");
+		DEFAULT_SKIP_URL.add("/customer-archive/public/**");
+		DEFAULT_SKIP_URL.add("/blade-openapi/openApi/mk/process/commonCallback");
+		DEFAULT_SKIP_URL.add("/openApi/mk/process/commonCallback");
 	}
 
 	/**

blade-service-api/blade-process-api/src/main/java/org/springblade/process/feign/IBusinessProcessClient.java

@@ -38,6 +38,8 @@ public interface IBusinessProcessClient {
     String QUERY_TODO_LIST = API_PREFIX + "/queryTodoList";
     String QUERY_BUSINESS_PROCESS_SNAPSHOT = API_PREFIX + "/queryBusinessProcessSnapshot";
     String QUERY_APPROVED_RECORD_LIST = API_PREFIX + "/queryApprovedRecordsNoAttachments";
+    String GET_CURRENT_NODES = API_PREFIX + "/getCurrentNodes";
+    String GET_PROCESS_INFO = API_PREFIX + "/getProcessInfo";
 
     /**
      * 提交业务流程
@@ -102,4 +104,26 @@ public interface IBusinessProcessClient {
      */
     @GetMapping(QUERY_APPROVED_RECORD_LIST)
     FR<List<ProcessApprovedRecordVO>> queryApprovedRecordsNoAttachments(@RequestParam(name = "bizId", required = false) String bizId, @RequestParam(name = "processInstanceId", required = false) String processInstanceId);
+
+    /**
+     * 获取流程当前节点详情
+     *
+     * @param processInstanceId 流程实例id
+     * @param loginName MK登录名（手机号）
+     * @return 当前节点详情
+     */
+    @GetMapping(GET_CURRENT_NODES)
+    FR<Object> getCurrentNodes(@RequestParam("processInstanceId") String processInstanceId,
+                               @RequestParam(value = "loginName", required = false) String loginName);
+
+    /**
+     * 获取流程实例详情
+     *
+     * @param processInstanceId 流程实例id
+     * @param loginName MK登录名（手机号）
+     * @return 流程实例详情
+     */
+    @GetMapping(GET_PROCESS_INFO)
+    FR<Object> getProcessInfo(@RequestParam("processInstanceId") String processInstanceId,
+                              @RequestParam(value = "loginName", required = false) String loginName);
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java

@@ -25,10 +25,13 @@
  */
 package org.springblade.system.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -185,4 +188,20 @@ public class Dept extends TenantEntity {
 	@Schema(description = "是否平台公司：0否，1是")
 	private Integer isPlatformCompany;
 
+	/**
+	 * OA主键，仅同步记录，不对外展示
+	 */
+	@JsonIgnore
+	@Schema(description = "OA主键", hidden = true)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private String oaId;
+
+	/**
+	 * OA上级主键，仅同步记录，不对外展示
+	 */
+	@JsonIgnore
+	@Schema(description = "OA上级主键", hidden = true)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private String oaSupSubComId;
+
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/MeasurementUnit.java

@@ -43,6 +43,12 @@ public class MeasurementUnit extends BaseEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 计量单位编码
+	 */
+	@Schema(description = "计量单位编码")
+	private String unitCode;
+
 	/**
 	 * 计量单位
 	 */

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/OaOrgSyncPageVO.java

@@ -0,0 +1,69 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.system.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * OA组织（公司/部门）分页同步结果
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "OA组织分页同步结果")
+public class OaOrgSyncPageVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "同步阶段：company / department")
+	private String stage;
+
+	@Schema(description = "当前页")
+	private Integer current;
+
+	@Schema(description = "每页条数")
+	private Integer size;
+
+	@Schema(description = "OA总条数")
+	private Long total;
+
+	@Schema(description = "本页从OA拉取的条数")
+	private Integer fetchedCount;
+
+	@Schema(description = "本页同步成功条数")
+	private Integer syncedCount;
+
+	@Schema(description = "本页跳过条数")
+	private Integer skippedCount;
+
+	@Schema(description = "是否已到最后一页")
+	private Boolean finished;
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/feign/ICustomerArchiveClient.java

@@ -0,0 +1,26 @@
+package org.springblade.transport.feign;
+
+import org.springblade.core.tool.api.FR;
+import org.springblade.transport.pojo.dto.CustomerProcessNodeSyncDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 客商档案 Feign接口
+ */
+@FeignClient(value = "blade-transport")
+public interface ICustomerArchiveClient {
+
+	String API_PREFIX = "/feign/client/customerArchive";
+	String SYNC_PROCESS_NODE = API_PREFIX + "/syncProcessNode";
+
+	/**
+	 * 按 MK 当前节点同步客商当前节点、当前处理人和审批状态
+	 *
+	 * @param param 同步参数
+	 * @return 是否成功
+	 */
+	@PostMapping(SYNC_PROCESS_NODE)
+	FR<Boolean> syncProcessNode(@RequestBody CustomerProcessNodeSyncDTO param);
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/feign/IMkProcessClient.java

@@ -0,0 +1,20 @@
+package org.springblade.transport.feign;
+
+import org.springblade.core.tool.api.FR;
+import org.springblade.transport.pojo.dto.MkProcessSyncDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * MK 业务流程同步 Feign
+ */
+@FeignClient(value = "blade-transport")
+public interface IMkProcessClient {
+
+	String API_PREFIX = "/feign/client/mkProcess";
+	String APPLY = API_PREFIX + "/apply";
+
+	@PostMapping(APPLY)
+	FR<Boolean> apply(@RequestBody MkProcessSyncDTO param);
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/CustomerProcessNodeSyncDTO.java

@@ -0,0 +1,33 @@
+package org.springblade.transport.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 客商流程当前节点同步参数
+ */
+@Data
+@Schema(description = "客商流程当前节点同步参数")
+public class CustomerProcessNodeSyncDTO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "客商ID")
+	private Long id;
+
+	@Schema(description = "当前节点")
+	private String currentNode;
+
+	@Schema(description = "当前处理人")
+	private String currentProcessor;
+
+	@Schema(description = "审批状态")
+	private String approvalStatus;
+
+	@Schema(description = "MK 流程实例详情，传入后按 currentHandlers.fdName 和 handlerInfos.nodeName 回写")
+	private Object processInfo;
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/MkProcessSyncDTO.java

@@ -0,0 +1,33 @@
+package org.springblade.transport.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * MK 流程节点同步参数
+ */
+@Data
+@Schema(description = "MK 流程节点同步参数")
+public class MkProcessSyncDTO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "业务类型，如 project-apply")
+	private String bizType;
+
+	@Schema(description = "业务主键")
+	private Long id;
+
+	@Schema(description = "动作：sync / approve / reject")
+	private String action;
+
+	@Schema(description = "处理人姓名")
+	private String processorName;
+
+	@Schema(description = "MK 流程实例详情")
+	private Object processInfo;
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerReceiptAccount.java

@@ -59,6 +59,9 @@ public class CustomerReceiptAccount extends TenantEntity {
 	@Schema(description = "开户行名称")
 	private String bankName;
 
+	@Schema(description = "联行号")
+	private String cnapsCode;
+
 	@Schema(description = "银行账号")
 	private String bankAccount;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ProjectApplyVO.java

@@ -30,6 +30,8 @@ import org.springblade.transport.pojo.entity.ProjectApply;
 
 import java.io.Serial;
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 项目立项视图实体类
@@ -104,4 +106,16 @@ public class ProjectApplyVO extends ProjectApply {
 	@Schema(description = "风险计算额度基数")
 	private BigDecimal maxFundLimit;
 
+	@TableField(exist = false)
+	@Schema(description = "货物类型字典，公开页回显使用")
+	private List<Map<String, String>> cargoTypeOptions;
+
+	@TableField(exist = false)
+	@Schema(description = "运输类型字典，公开页回显使用")
+	private List<Map<String, String>> transportTypeOptions;
+
+	@TableField(exist = false)
+	@Schema(description = "结算方式字典，公开页回显使用")
+	private List<Map<String, String>> settlementModeOptions;
+
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/WaybillLocateVO.java

@@ -0,0 +1,74 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * 运单车辆实时定位结果
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "运单车辆实时定位结果")
+public class WaybillLocateVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "运单ID")
+	private Long waybillId;
+
+	@Schema(description = "车牌号")
+	private String vehicleNo;
+
+	@Schema(description = "经度")
+	private BigDecimal longitude;
+
+	@Schema(description = "纬度")
+	private BigDecimal latitude;
+
+	@Schema(description = "地址")
+	private String address;
+
+	@Schema(description = "定位时间")
+	private String locateTime;
+
+	@Schema(description = "速度")
+	private String speed;
+
+	@Schema(description = "方向")
+	private String direction;
+
+	@Schema(description = "LBS原始数据")
+	private Map<String, Object> rawData;
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/WaybillTrackVO.java

@@ -0,0 +1,95 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 运单历史轨迹结果
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "运单历史轨迹结果")
+public class WaybillTrackVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "运单ID")
+	private Long waybillId;
+
+	@Schema(description = "车牌号")
+	private String vehicleNo;
+
+	@Schema(description = "开始日期")
+	private String startDate;
+
+	@Schema(description = "结束日期")
+	private String endDate;
+
+	@Schema(description = "轨迹点数量")
+	private Integer total;
+
+	@Schema(description = "轨迹点列表")
+	private List<WaybillTrackPointVO> points = new ArrayList<>();
+
+	@Data
+	@Schema(description = "轨迹点")
+	public static class WaybillTrackPointVO implements Serializable {
+
+		@Serial
+		private static final long serialVersionUID = 1L;
+
+		@Schema(description = "车牌号")
+		private String vehicleNo;
+
+		@Schema(description = "经度")
+		private BigDecimal longitude;
+
+		@Schema(description = "纬度")
+		private BigDecimal latitude;
+
+		@Schema(description = "定位时间")
+		private String locateTime;
+
+		@Schema(description = "速度")
+		private String speed;
+
+		@Schema(description = "方向")
+		private String direction;
+
+		@Schema(description = "地址")
+		private String address;
+	}
+}

blade-service/blade-openapi/src/main/java/org/springblade/openapi/OpenApiApplication.java

@@ -44,6 +44,10 @@ public class OpenApiApplication {
 
 	public static void main(String[] args) {
 		BladeApplication.disableNacosLaunchConfig();
+		// 当前处理人刷新依赖 RedisLockClient；Nacos 全局 blade.lock.enabled=false 时仍需为本服务开启
+		if (System.getProperty("blade.lock.enabled") == null) {
+			System.setProperty("blade.lock.enabled", "true");
+		}
 		BladeApplication.run(AppConstant.APPLICATION_OPENAPI_NAME, OpenApiApplication.class, args);
 	}
 

blade-service/blade-openapi/src/main/java/org/springblade/openapi/mk/Api4MK.java

@@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.Hidden;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.secure.constant.AuthConstant;
 import org.springblade.core.tool.api.FR;
 import org.springblade.openapi.mk.api.IApi4MK;
 import org.springblade.openapi.mk.pojo.dto.Api4MKProcessApprovalDTO;
@@ -49,6 +51,7 @@ public class Api4MK implements IApi4MK {
     }
 
     @Override
+    @PreAuth(AuthConstant.PERMIT_ALL)
     public FR<Boolean> processCommonCallback(Api4MKProcessApprovalDTO param) {
         log.info("mk流程通用回调 操作名称：{} 参数：{}", ProcessOperationType.getOperationName(param.getOperation()), JSON.toJSONString(param));
         callback(param, ProcessHandler::approve);

blade-service/blade-openapi/src/main/resources/application.yml

@@ -10,6 +10,7 @@ spring:
       - nacos:blade-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
       - nacos:blade-openapi-dynamictp.yaml?group=DEFAULT_GROUP&refreshEnabled=true
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
+      - optional:classpath:openapi-lock.yaml
   cloud:
     nacos:
       username: ${NACOS_USERNAME:${NACOS_PROD_USERNAME:nacos}}

blade-service/blade-openapi/src/main/resources/openapi-lock.yaml

@@ -0,0 +1,9 @@
+# openapi 当前处理人刷新依赖 Redisson 分布式锁。
+# 该文件必须在 nacos blade-*.yaml 之后导入，用于覆盖全局 blade.lock.enabled=false。
+# 连接信息与业务 Redis 保持一致，避免 Redisson 因缺少密码出现 NOAUTH。
+blade:
+  lock:
+    enabled: true
+    address: redis://${spring.data.redis.host:127.0.0.1}:${spring.data.redis.port:6379}
+    password: ${spring.data.redis.password:}
+    database: ${spring.data.redis.database:0}

blade-service/blade-system/pom.xml

@@ -62,6 +62,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-mk-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-transport-api</artifactId>
+        </dependency>
 
         <!-- 其他依赖 -->
         <dependency>

blade-service/blade-system/src/main/java/org/springblade/process/controller/BusinessProcessController.java

@@ -17,6 +17,7 @@ import org.springblade.process.pojo.dto.ApprovalDTO;
 import org.springblade.process.pojo.vo.ApprovalVO;
 import org.springblade.process.pojo.vo.ProcessApprovedRecordVO;
 import org.springblade.process.service.IBusinessProcessService;
+import org.springblade.thirdparty.mk.pojo.dto.MKProcessCreateDTO;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -52,29 +53,42 @@ public class BusinessProcessController extends BladeController {
 		return R.data(pages);
 	}
 
-	@GetMapping("/isEditView")
+	@PostMapping("/processSubmit")
 	@ApiOperationSupport(order = 2)
+	@Operation(summary = "提交MK审核流", description = "调用mk processSubmit，传入templateCode/submitIdentity/formInstanceId")
+	public R<String> processSubmit(@Validated @RequestBody MKProcessCreateDTO param) {
+		return R.data(businessProcessService.processSubmit(param));
+	}
+
+	@PostMapping("/processDelete")
+	@ApiOperationSupport(order = 7)
+	public R<Boolean> processDelete(@RequestBody MKProcessCreateDTO param) {
+		return R.data(businessProcessService.processDelete(param == null ? null : param.getFormInstanceId()));
+	}
+
+	@GetMapping("/isEditView")
+	@ApiOperationSupport(order = 3)
 	@Operation(summary = "是否编辑页", description  = "传入业务id")
 	public R<Boolean> isEditView(@Valid @NotBlank(message = "业务id不能为空") String bizId) {
 		return R.data(businessProcessService.isEditView(bizId));
 	}
 
 	@GetMapping("/getMKApprovalUrl")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 4)
 	@Operation(summary = "获取mk审批页链接", description  = "传入业务id或流程实例id")
 	public R<String> getMKApprovalUrl(String bizId, String processInstanceId) {
 		return R.data(businessProcessService.getMKApprovalUrl(bizId, processInstanceId));
 	}
 
 	@GetMapping("/getApprovedRecords")
-	@ApiOperationSupport(order = 4)
+	@ApiOperationSupport(order = 5)
 	@Operation(summary = "查询审批记录", description  = "传入业务id或流程实例id")
 	public R<List<ProcessApprovedRecordVO>> getApprovedRecords(String bizId, String processInstanceId) {
 		return R.data(businessProcessService.queryApprovedRecords(bizId, processInstanceId));
 	}
 
 	@GetMapping("/downloadFile")
-	@ApiOperationSupport(order = 5)
+	@ApiOperationSupport(order = 6)
 	@Operation(summary = "下载附件", description  = "传入附件id")
 	public void downloadFile(HttpServletResponse response, @Valid @NotBlank(message = "附件id不能为空") String fileId) {
 		businessProcessService.downloadFile(response, fileId);

blade-service/blade-system/src/main/java/org/springblade/process/feign/BusinessProcessClient.java

@@ -3,6 +3,8 @@ package org.springblade.process.feign;
 import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.secure.constant.AuthConstant;
 import org.springblade.core.tool.api.FR;
 import org.springblade.process.pojo.dto.BusinessProcessCurrentHandlerRefreshDTO;
 import org.springblade.process.pojo.dto.BusinessProcessDeleteDTO;
@@ -13,8 +15,10 @@ import org.springblade.process.pojo.vo.ProcessApprovedRecordVO;
 import org.springblade.process.pojo.vo.ProcessTodoVO;
 import org.springblade.process.service.IBusinessProcessService;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -74,4 +78,20 @@ public class BusinessProcessClient implements IBusinessProcessClient {
     public FR<List<ProcessApprovedRecordVO>> queryApprovedRecordsNoAttachments(String bizId, String processInstanceId) {
         return FR.data(businessProcessService.queryApprovedRecordsNoAttachments(bizId, processInstanceId));
     }
+
+    @PreAuth(AuthConstant.PERMIT_ALL)
+    @GetMapping(GET_CURRENT_NODES)
+    @Override
+    public FR<Object> getCurrentNodes(@RequestParam("processInstanceId") String processInstanceId,
+                                      @RequestParam(value = "loginName", required = false) String loginName) {
+        return FR.data(businessProcessService.getCurrentNodes(processInstanceId, loginName));
+    }
+
+    @PreAuth(AuthConstant.PERMIT_ALL)
+    @GetMapping(GET_PROCESS_INFO)
+    @Override
+    public FR<Object> getProcessInfo(@RequestParam("processInstanceId") String processInstanceId,
+                                     @RequestParam(value = "loginName", required = false) String loginName) {
+        return FR.data(businessProcessService.getProcessInfo(processInstanceId, loginName));
+    }
 }

blade-service/blade-system/src/main/java/org/springblade/process/service/IBusinessProcessService.java

@@ -6,6 +6,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import org.springblade.process.pojo.dto.*;
 import org.springblade.process.pojo.entity.BusinessProcess;
 import org.springblade.process.pojo.vo.*;
+import org.springblade.thirdparty.mk.pojo.dto.MKProcessCreateDTO;
 
 import java.util.List;
 
@@ -25,6 +26,40 @@ public interface IBusinessProcessService extends IService<BusinessProcess> {
 	 */
 	BusinessProcessVO submitBusinessProcess(BusinessProcessSubmitDTO<?> param);
 
+	/**
+	 * 直接调用 MK processSubmit 提交流程
+	 *
+	 * @param param MK 流程创建参数
+	 * @return 流程实例 id
+	 */
+	String processSubmit(MKProcessCreateDTO param);
+
+	/**
+	 * 按业务表单实例 id 删除 MK 流程（不删除本地业务流程记录，供驳回后重新提交使用）
+	 *
+	 * @param formInstanceId 业务表单实例 id
+	 * @return 是否成功
+	 */
+	boolean processDelete(String formInstanceId);
+
+	/**
+	 * 获取流程当前节点详情
+	 *
+	 * @param processInstanceId 流程实例id
+	 * @param loginName MK登录名（手机号），可为空，为空时按流程发起人解析
+	 * @return 当前节点列表
+	 */
+	List<?> getCurrentNodes(String processInstanceId, String loginName);
+
+	/**
+	 * 获取流程实例详情
+	 *
+	 * @param processInstanceId 流程实例id
+	 * @param loginName MK登录名（手机号），可为空，为空时按流程发起人解析
+	 * @return 流程实例详情
+	 */
+	Object getProcessInfo(String processInstanceId, String loginName);
+
     /**
      *  修改业务流程状态
      * @param param

blade-service/blade-system/src/main/java/org/springblade/process/service/impl/BusinessProcessServiceImpl.java

@@ -15,6 +15,7 @@ import org.springblade.process.pojo.enums.ApproveStatusEnum;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.log.utils.AssertUtils;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.FR;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.process.convert.ApprovalConvert;
 import org.springblade.process.convert.BusinessProcessConvert;
@@ -24,6 +25,8 @@ import org.springblade.process.pojo.entity.BusinessProcess;
 import org.springblade.process.pojo.enums.TodoStatus;
 import org.springblade.process.pojo.vo.*;
 import org.springblade.process.service.IBusinessProcessService;
+import org.springblade.system.pojo.entity.User;
+import org.springblade.system.service.IUserService;
 import org.springblade.thirdparty.mk.config.MKProperties;
 import org.springblade.thirdparty.mk.constant.MKConstant;
 import org.springblade.thirdparty.mk.constant.MKDoc;
@@ -39,12 +42,17 @@ import org.springblade.thirdparty.mk.pojo.dto.approval.MKProcessDTO;
 import org.springblade.thirdparty.mk.pojo.dto.sort.*;
 import org.springblade.thirdparty.mk.pojo.vo.*;
 import org.springblade.thirdparty.mk.service.IMKService;
+import org.springblade.transport.feign.ICustomerArchiveClient;
+import org.springblade.transport.feign.IMkProcessClient;
+import org.springblade.transport.pojo.dto.CustomerProcessNodeSyncDTO;
+import org.springblade.transport.pojo.dto.MkProcessSyncDTO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 业务流程关联表 服务实现类
@@ -61,6 +69,9 @@ public class BusinessProcessServiceImpl extends ServiceImpl<BusinessProcessMappe
 	private final IMKService mkService;
 	private final MKProperties mkProperties;
 	private final ApprovalConvert approvalConvert;
+	private final IUserService userService;
+	private final ICustomerArchiveClient customerArchiveClient;
+	private final IMkProcessClient mkProcessClient;
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
@@ -114,6 +125,259 @@ public class BusinessProcessServiceImpl extends ServiceImpl<BusinessProcessMappe
 		return businessProcessVO;
 	}
 
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public String processSubmit(MKProcessCreateDTO param) {
+		AssertUtils.notNull(param, "提交流程参数不能为空");
+		AssertUtils.notBlank(param.getFormInstanceId(), "表单实例id不能为空");
+		AssertUtils.notBlank(param.getTemplateCode(), "模板编码不能为空");
+		// 前端拿到的手机号可能经 @Sensitive 脱敏（如 137****8880），这里从库取真实手机号覆盖
+		String loginName = resolveCurrentUserPhone();
+		AssertUtils.notBlank(loginName, "当前用户手机号为空，无法提交审核流");
+		param.setSubmitIdentity(loginName);
+		param.setLoginName(loginName);
+		String bizType = param.getBizType();
+		MKProcessCreateDTO mkParam = new MKProcessCreateDTO();
+		mkParam.setFormInstanceId(param.getFormInstanceId());
+		mkParam.setSubject(param.getSubject());
+		mkParam.setSubmitIdentity(loginName);
+		mkParam.setLoginName(loginName);
+		mkParam.setTemplateCode(param.getTemplateCode());
+		mkParam.setFormValues(param.getFormValues());
+		mkParam.setTempVarData(param.getTempVarData());
+		log.info("调用mk processSubmit 参数：{}", JSON.toJSONString(mkParam));
+		String processInstanceId = mkService.processSubmit(mkParam);
+		AssertUtils.notBlank(processInstanceId, "提交流程失败，未返回流程实例id");
+
+		Long bizId;
+		try {
+			bizId = Long.valueOf(param.getFormInstanceId());
+		} catch (NumberFormatException e) {
+			throw new ServiceException("表单实例id格式不正确");
+		}
+		BusinessProcess businessProcess = this.getOne(Wrappers.<BusinessProcess>lambdaQuery()
+			.eq(BusinessProcess::getBizId, bizId)
+		);
+		if (businessProcess == null) {
+			businessProcess = new BusinessProcess();
+			businessProcess.setBizId(bizId);
+			businessProcess.setProcessType(param.getTemplateCode());
+			businessProcess.setSubject(param.getSubject());
+			businessProcess.setPromoterId(AuthUtil.getUserId());
+			businessProcess.setPromoterName(AuthUtil.getNickName());
+			businessProcess.setPromoterLoginName(loginName);
+			businessProcess.setSubmitTime(new Date());
+		} else {
+			businessProcess.setProcessType(param.getTemplateCode());
+			if (StringUtil.isNotBlank(param.getSubject())) {
+				businessProcess.setSubject(param.getSubject());
+			}
+			businessProcess.setPromoterLoginName(loginName);
+			if (businessProcess.getSubmitTime() == null) {
+				businessProcess.setSubmitTime(new Date());
+			}
+		}
+		businessProcess.setProcessInstanceId(processInstanceId);
+		businessProcess.setApproveStatus(ApproveStatusEnum.APPROVING.getValue());
+		this.saveOrUpdate(businessProcess);
+		this.getCurrentNodes(processInstanceId, loginName);
+		Object processInfo = this.getProcessInfo(processInstanceId, loginName);
+		this.syncBizFromProcessInfo(bizType, param.getFormInstanceId(), processInfo);
+		return processInstanceId;
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public boolean processDelete(String formInstanceId) {
+		AssertUtils.notBlank(formInstanceId, "表单实例id不能为空");
+		Long bizId;
+		try {
+			bizId = Long.valueOf(formInstanceId);
+		} catch (NumberFormatException e) {
+			throw new ServiceException("表单实例id格式不正确");
+		}
+		BusinessProcess businessProcess = this.getOne(Wrappers.<BusinessProcess>lambdaQuery()
+			.eq(BusinessProcess::getBizId, bizId)
+		);
+		if (businessProcess == null || StringUtil.isBlank(businessProcess.getProcessInstanceId())) {
+			log.warn("客商驳回后删除流程跳过，未找到流程实例 formInstanceId={}", formInstanceId);
+			return true;
+		}
+		String loginName = businessProcess.getPromoterLoginName();
+		if (StringUtil.isBlank(loginName)) {
+			loginName = resolveCurrentUserPhone();
+		}
+		AssertUtils.notBlank(loginName, "当前用户手机号为空，无法删除审核流");
+		log.info("调用mk processDelete processInstanceId={} loginName={} formInstanceId={}",
+			businessProcess.getProcessInstanceId(), loginName, formInstanceId);
+		boolean deleted = mkService.processDelete(businessProcess.getProcessInstanceId(), loginName);
+		if (!deleted) {
+			throw new ServiceException("删除MK流程失败");
+		}
+		return true;
+	}
+
+	@Override
+	public List<?> getCurrentNodes(String processInstanceId, String loginName) {
+		if (StringUtils.isBlank(processInstanceId)) {
+			log.warn("查询当前节点失败，processInstanceId为空");
+			return Collections.emptyList();
+		}
+		String resolvedLoginName = loginName;
+		if (StringUtils.isBlank(resolvedLoginName)) {
+			BusinessProcess businessProcess = this.getBusinessProcessByProcessInstanceId(processInstanceId);
+			resolvedLoginName = resolvePromoterLoginName(businessProcess, null);
+		}
+		if (StringUtils.isBlank(resolvedLoginName)) {
+			log.warn("查询当前节点失败，loginName为空 processInstanceId={}", processInstanceId);
+			return Collections.emptyList();
+		}
+		try {
+			List<MKNodeVO> currentNodes = mkService.getCurrentNodes(processInstanceId, resolvedLoginName);
+			log.info("获取流程当前节点详情 processInstanceId={} loginName={} result={}",
+				processInstanceId, resolvedLoginName, JSON.toJSONString(currentNodes));
+			return currentNodes == null ? Collections.emptyList() : currentNodes;
+		} catch (Exception e) {
+			log.error("查询当前节点异常 processInstanceId={} loginName={}", processInstanceId, resolvedLoginName, e);
+			return Collections.emptyList();
+		}
+	}
+
+	@Override
+	public Object getProcessInfo(String processInstanceId, String loginName) {
+		if (StringUtils.isBlank(processInstanceId)) {
+			log.warn("查询流程实例详情失败，processInstanceId为空");
+			return null;
+		}
+		String resolvedLoginName = loginName;
+		if (StringUtils.isBlank(resolvedLoginName)) {
+			BusinessProcess businessProcess = this.getBusinessProcessByProcessInstanceId(processInstanceId);
+			resolvedLoginName = resolvePromoterLoginName(businessProcess, null);
+		}
+		if (StringUtils.isBlank(resolvedLoginName)) {
+			log.warn("查询流程实例详情失败，loginName为空 processInstanceId={}", processInstanceId);
+			return null;
+		}
+		try {
+			Object processInfo = mkService.getProcessInfo(processInstanceId, resolvedLoginName);
+			log.info("获取流程实例详情 processInstanceId={} loginName={} result={}",
+				processInstanceId, resolvedLoginName, JSON.toJSONString(processInfo));
+			return processInfo;
+		} catch (Exception e) {
+			log.error("查询流程实例详情异常 processInstanceId={} loginName={}", processInstanceId, resolvedLoginName, e);
+			return null;
+		}
+	}
+
+	private void syncBizFromProcessInfo(String bizType, String formInstanceId, Object processInfo) {
+		if (StringUtils.isBlank(formInstanceId) || processInfo == null) {
+			log.warn("同步业务当前节点跳过，formInstanceId或流程实例详情为空 formInstanceId={}", formInstanceId);
+			return;
+		}
+		Long bizId;
+		try {
+			bizId = Long.valueOf(formInstanceId);
+		} catch (NumberFormatException e) {
+			log.warn("同步业务当前节点失败，表单实例id不是数字：{}", formInstanceId);
+			return;
+		}
+		String resolvedBizType = StringUtils.isBlank(bizType) ? "customer-archive" : bizType;
+		if ("customer-archive".equals(resolvedBizType)) {
+			this.syncCustomerArchiveFromProcessInfo(formInstanceId, processInfo);
+			return;
+		}
+		MkProcessSyncDTO param = new MkProcessSyncDTO();
+		param.setBizType(resolvedBizType);
+		param.setId(bizId);
+		param.setAction("sync");
+		param.setProcessInfo(processInfo);
+		try {
+			FR<Boolean> result = mkProcessClient.apply(param);
+			log.info("同步业务当前节点完成 bizType={} bizId={} result={}",
+				resolvedBizType, bizId, JSON.toJSONString(result));
+		} catch (Exception e) {
+			log.error("同步业务当前节点异常 bizType={} bizId={}", resolvedBizType, bizId, e);
+		}
+	}
+
+	private void syncCustomerArchiveFromProcessInfo(String formInstanceId, Object processInfo) {
+		if (StringUtils.isBlank(formInstanceId) || processInfo == null) {
+			log.warn("同步客商当前节点跳过，formInstanceId或流程实例详情为空 formInstanceId={}", formInstanceId);
+			return;
+		}
+		Long customerId;
+		try {
+			customerId = Long.valueOf(formInstanceId);
+		} catch (NumberFormatException e) {
+			log.warn("同步客商当前节点失败，表单实例id不是数字：{}", formInstanceId);
+			return;
+		}
+		CustomerProcessNodeSyncDTO param = new CustomerProcessNodeSyncDTO();
+		param.setId(customerId);
+		param.setProcessInfo(processInfo);
+		param.setApprovalStatus("reviewing");
+		try {
+			FR<Boolean> result = customerArchiveClient.syncProcessNode(param);
+			log.info("同步客商当前节点完成 customerId={} result={}", customerId, JSON.toJSONString(result));
+		} catch (Exception e) {
+			log.error("同步客商当前节点异常 customerId={}", customerId, e);
+		}
+	}
+
+	private String readMkNodeName(Object node) {
+		if (node instanceof MKNodeVO vo) {
+			return vo.getNodeName();
+		}
+		if (node instanceof Map<?, ?> map) {
+			Object value = map.get("nodeName");
+			return value == null ? null : String.valueOf(value);
+		}
+		return null;
+	}
+
+	private Stream<String> readMkHandlerNames(Object node) {
+		List<MKNodeHandlerVO> handlers = null;
+		if (node instanceof MKNodeVO vo) {
+			handlers = vo.getNodeHandlers();
+		} else if (node instanceof Map<?, ?> map && map.get("nodeHandlers") instanceof List<?> list) {
+			return list.stream().map(item -> {
+				if (item instanceof MKNodeHandlerVO handler) {
+					return handler.getHandlerName();
+				}
+				if (item instanceof Map<?, ?> handlerMap) {
+					Object value = handlerMap.get("handlerName");
+					return value == null ? null : String.valueOf(value);
+				}
+				return null;
+			});
+		}
+		if (CollectionUtil.isEmpty(handlers)) {
+			return Stream.empty();
+		}
+		return handlers.stream().map(MKNodeHandlerVO::getHandlerName);
+	}
+
+	/**
+	 * 从当前登录用户实体读取真实手机号（绕过接口返回脱敏）
+	 */
+	private String resolveCurrentUserPhone() {
+		Long userId = AuthUtil.getUserId();
+		if (userId != null) {
+			User user = userService.getById(userId);
+			if (user != null && StringUtil.isNotBlank(user.getPhone()) && !user.getPhone().contains("*")) {
+				return user.getPhone().trim();
+			}
+			if (user != null && StringUtil.isNotBlank(user.getAccount()) && user.getAccount().matches("^1\\d{10}$")) {
+				return user.getAccount().trim();
+			}
+		}
+		String account = AuthUtil.getUserAccount();
+		if (StringUtil.isNotBlank(account) && account.matches("^1\\d{10}$")) {
+			return account.trim();
+		}
+		return null;
+	}
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String updateBusinessProcessStatus(BusinessProcessUpdateDTO param) {

blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -50,8 +50,10 @@ import org.springblade.system.pojo.entity.Dept;
 import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.enums.DictEnum;
 import org.springblade.system.pojo.vo.DeptVO;
+import org.springblade.system.pojo.vo.OaOrgSyncPageVO;
 import org.springblade.system.pojo.vo.UserVO;
 import org.springblade.system.service.IDeptService;
+import org.springblade.system.service.IOASyncService;
 import org.springblade.system.wrapper.DeptWrapper;
 import org.springframework.web.bind.annotation.*;
 
@@ -73,6 +75,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 public class DeptController extends BladeController {
 
 	private final IDeptService deptService;
+	private final IOASyncService oaSyncService;
 
 	/**
 	 * 详情
@@ -170,12 +173,52 @@ public class DeptController extends BladeController {
 		return R.data(deptService.syncIamOrganizations());
 	}
 
+	/**
+	 * 清除非顶级组织，供自动同步前确认后调用
+	 */
+	@IsAdmin
+	@PostMapping("/clear-non-top")
+	@ApiOperationSupport(order = 8)
+	@Operation(summary = "清除非顶级组织")
+	public R<Integer> clearNonTopDepts() {
+		int clearedCount = deptService.clearNonTopDepts();
+		CacheUtil.clear(SYS_CACHE);
+		CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
+		return R.data(clearedCount);
+	}
+
+	/**
+	 * 从OA按页同步公司
+	 */
+	@IsAdmin
+	@PostMapping("/sync-oa-company")
+	@ApiOperationSupport(order = 8)
+	@Operation(summary = "同步OA公司")
+	public R<OaOrgSyncPageVO> syncOaCompany(
+		@RequestParam(defaultValue = "1") Integer current,
+		@RequestParam(defaultValue = "20") Integer size) {
+		return R.data(oaSyncService.syncCompanyPage(current, size));
+	}
+
+	/**
+	 * 从OA按页同步部门（需先完成公司同步）
+	 */
+	@IsAdmin
+	@PostMapping("/sync-oa-department")
+	@ApiOperationSupport(order = 9)
+	@Operation(summary = "同步OA部门")
+	public R<OaOrgSyncPageVO> syncOaDepartment(
+		@RequestParam(defaultValue = "1") Integer current,
+		@RequestParam(defaultValue = "20") Integer size) {
+		return R.data(oaSyncService.syncDepartmentPage(current, size));
+	}
+
 	/**
 	 * 删除
 	 */
 	@IsAdmin
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
+	@ApiOperationSupport(order = 10)
 	@Operation(summary = "删除", description = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		CacheUtil.clear(SYS_CACHE);
@@ -188,7 +231,7 @@ public class DeptController extends BladeController {
 	 */
 	@PreAuth(AuthConstant.PERMIT_ALL)
 	@GetMapping("/select")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 11)
 	@Operation(summary = "下拉数据源", description = "传入id集合")
 	public R<List<Dept>> select(Long userId, String deptId) {
 		if (Func.isNotEmpty(userId)) {
@@ -205,7 +248,7 @@ public class DeptController extends BladeController {
 	 */
 	@PreAuth(AuthConstant.PERMIT_ALL)
 	@GetMapping("/platform-company-select")
-	@ApiOperationSupport(order = 10)
+	@ApiOperationSupport(order = 12)
 	@Operation(summary = "平台公司下拉", description = "返回是否平台公司=是的部门列表")
 	public R<List<Dept>> platformCompanySelect() {
 		return R.data(deptService.listPlatformCompany());
@@ -216,7 +259,7 @@ public class DeptController extends BladeController {
 	 */
 	@IsAdmin
 	@GetMapping("/dept-leader-info")
-	@ApiOperationSupport(order = 11)
+	@ApiOperationSupport(order = 13)
 	@Operation(summary = "获取部门的主管信息", description = "传入deptId")
 	public R<List<UserVO>> deptLeaderInfo(@Parameter(description = "部门id", required = true) @RequestParam Long deptId) {
 		List<UserVO> list = deptService.deptLeaderInfo(deptId);

blade-service/blade-system/src/main/java/org/springblade/system/controller/PortTerminalController.java

@@ -43,6 +43,8 @@ import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.common.excel.ImportFailureExcelUtil;
+import org.springblade.system.excel.ImportFailureException;
 import org.springblade.system.excel.PortTerminalExcel;
 import org.springblade.system.excel.PortTerminalExportExcel;
 import org.springblade.system.excel.PortTerminalImporter;
@@ -175,14 +177,25 @@ public class PortTerminalController extends BladeController {
 		if (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx")) {
 			return R.fail("请上传 .xls,.xlsx 标准格式文件");
 		}
-		List<PortTerminalExcel> failureList = portTerminalService.importPortTerminal(ExcelUtil.read(file, PortTerminalExcel.class));
-		if (Func.isNotEmpty(failureList)) {
-			org.springblade.common.excel.ImportFailureExcelUtil.exportFailureReasonOnly(response, "港口码头主数据导入失败明细" + DateUtil.time(), "导入失败明细", failureList, PortTerminalExcel.class);
+		try {
+			portTerminalService.importPortTerminal(ExcelUtil.read(file, PortTerminalExcel.class));
+		} catch (ImportFailureException exception) {
+			// 全失败即整批回滚，导出原表全部数据并标注错误，用户修正后重新导入。
+			exportFailure(response, exception.getFailureList());
 			return null;
 		}
 		return R.success("操作成功");
 	}
 
+	/**
+	 * 导出导入失败明细，内容为原表全部数据并在末尾追加失败原因列。
+	 * <p>
+	 * 失败数据仅标红出错单元格与失败原因列，表头保持默认样式。
+	 */
+	private void exportFailure(HttpServletResponse response, List<?> failureList) {
+		ImportFailureExcelUtil.exportFailureReasonOnly(response, "港口码头主数据导入失败明细" + DateUtil.time(), "导入失败明细", failureList, PortTerminalExcel.class);
+	}
+
 	/**
 	 * 导出港口码头主数据
 	 */

blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java

@@ -169,7 +169,7 @@ public class UserController {
 	@Operation(summary = "同步OA人员")
 	public R<OaPersonSyncPageVO> syncIamAccounts(
 		@RequestParam(defaultValue = "1") Integer current,
-		@RequestParam(defaultValue = "50") Integer size) {
+		@RequestParam(defaultValue = "20") Integer size) {
 		return R.data(oaSyncService.syncPersonFromUserList(current, size));
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/convert/DeptConvert.java

@@ -80,6 +80,9 @@ public interface DeptConvert {
         }
         // 公司所属公司编码就是他自己的部门编码
         dept.setBelongCompanyCode(dept.getDeptCode());
+        // OA主键与上级OA主键，分批同步结束后用于重建层级
+        dept.setOaId(company.getId());
+        dept.setOaSupSubComId(company.getSupsubcomid());
         // 显示顺序处理
         dept.setSort(OAUtils.parseInt(company.getShoworder()));
         // 部门类型，公司
@@ -100,6 +103,13 @@ public interface DeptConvert {
         Dept dept = this.baseConvert(oaDept);
         // 部门编码添加前缀
         dept.setDeptCode(OAConvertConstant.DEPARTMENT_OA_PREFIX + oaDept.getId());
+        // OA主键；上级为根部门时记录所属公司OA主键，否则记录上级部门OA主键
+        dept.setOaId(oaDept.getId());
+        if (OAConstant.ROOT_COMPANY_ID.equals(oaDept.getSupdepid())) {
+            dept.setOaSupSubComId(oaDept.getSubcompanyid1());
+        } else {
+            dept.setOaSupSubComId(oaDept.getSupdepid());
+        }
         // 部门所属公司编码就是他所属公司编码加前缀
         dept.setBelongCompanyCode(OAConvertConstant.COMPANY_OA_PREFIX + dept.getBelongCompanyCode());
         String parentCode = dept.getParentCode();

blade-service/blade-system/src/main/java/org/springblade/system/excel/CurrencyExcel.java

@@ -35,7 +35,6 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 /**
  * 币种汇率 Excel
@@ -62,8 +61,8 @@ public class CurrencyExcel implements Serializable {
 	@ExcelProperty("汇率")
 	private BigDecimal exchangeRate;
 
-	@ExcelProperty("生效日期")
-	private LocalDate effectiveDate;
+	@ExcelProperty(value = "生效日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String effectiveDate;
 
 	@ExcelProperty("状态")
 	private String statusName;
@@ -71,8 +70,8 @@ public class CurrencyExcel implements Serializable {
 	@ExcelProperty("来源")
 	private String dataSource;
 
-	@ExcelProperty("失效日期")
-	private LocalDate expiryDate;
+	@ExcelProperty(value = "失效日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String expiryDate;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-system/src/main/java/org/springblade/system/excel/ImportFailureException.java

@@ -0,0 +1,60 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.system.excel;
+
+import org.springblade.core.log.exception.ServiceException;
+
+import java.io.Serial;
+import java.util.List;
+
+/**
+ * 导入失败异常，携带失败明细用于导出原表并标注错误。
+ * <p>
+ * 批量导入采用「全失败即整批回滚」语义：任一行校验失败都会抛出本异常触发事务回滚，
+ * 失败明细在抛异常前已收集完毕，因此回滚不影响明细的内容。
+ *
+ * @author Chill
+ */
+public class ImportFailureException extends ServiceException {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 失败明细，包含原表全部数据，错误行已标注错误原因。
+	 */
+	private final transient List<?> failureList;
+
+	public ImportFailureException(List<?> failureList) {
+		super("导入失败，已回滚全部数据");
+		this.failureList = failureList;
+	}
+
+	public List<?> getFailureList() {
+		return failureList;
+	}
+
+}

blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java

@@ -34,7 +34,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * UserExcel
@@ -102,7 +101,7 @@ public class UserExcel implements Serializable {
 	private String postName;
 
 	@ColumnWidth(20)
-	@ExcelProperty("生日")
-	private Date birthday;
+	@ExcelProperty(value = "生日", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String birthday;
 
 }

blade-service/blade-system/src/main/java/org/springblade/system/mapper/MeasurementUnitMapper.xml

@@ -13,6 +13,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="unit_code" property="unitCode"/>
         <result column="unit_name" property="unitName"/>
         <result column="dimension" property="dimension"/>
         <result column="remark" property="remark"/>
@@ -30,6 +31,7 @@
             mmu.update_time,
             mmu.status,
             mmu.is_deleted,
+            mmu.unit_code,
             mmu.unit_name,
             mmu.dimension,
             mmu.remark
@@ -39,6 +41,10 @@
             LEFT JOIN blade_user uu ON uu.id = mmu.update_user
         WHERE
             mmu.is_deleted = 0
+        <if test="measurementUnit.unitCode != null and measurementUnit.unitCode != ''">
+            <bind name="unitCodeLike" value="'%' + measurementUnit.unitCode + '%'"/>
+            AND mmu.unit_code LIKE #{unitCodeLike}
+        </if>
         <if test="measurementUnit.unitName != null and measurementUnit.unitName != ''">
             <bind name="unitNameLike" value="'%' + measurementUnit.unitName + '%'"/>
             AND mmu.unit_name LIKE #{unitNameLike}

blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml

@@ -95,7 +95,7 @@
     </select>
 
     <select id="exportUser" resultType="org.springblade.system.excel.UserExcel">
-        SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
+        SELECT id, tenant_id, user_type, account, name, real_name, email, phone, DATE_FORMAT(birthday, '%Y-%m-%d') AS birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
     </select>
 
     <select id="selectCustomerOptions" resultType="java.util.HashMap">

blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java

@@ -146,6 +146,13 @@ public interface IDeptService extends IService<Dept> {
 	 */
 	boolean removeDept(String ids);
 
+	/**
+	 * 删除非顶级组织，顶级组织（父级为 0）保留
+	 *
+	 * @return 删除数量
+	 */
+	int clearNonTopDepts();
+
 	/**
 	 * 新增或修改部门
 	 * <p>
@@ -187,4 +194,16 @@ public interface IDeptService extends IService<Dept> {
 	 */
 	void updateAncestors(Date startTime);
 
+	/**
+	 * 按 OA 主键与上级 OA 主键重建组织、部门父子关系，并刷新祖级列表
+	 */
+	void rebuildOaHierarchy();
+
+	/**
+	 * 删除 OA 同步后无法挂到上级的组织（上级 OA 主键在本地不存在），并级联删除其子级
+	 *
+	 * @return 删除数量
+	 */
+	int removeOaOrphansWithoutParent();
+
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/IOASyncService.java

@@ -1,5 +1,6 @@
 package org.springblade.system.service;
 
+import org.springblade.system.pojo.vo.OaOrgSyncPageVO;
 import org.springblade.system.pojo.vo.OaPersonSyncPageVO;
 
 /**
@@ -36,4 +37,22 @@ public interface IOASyncService {
      * @return 本页同步结果
      */
     OaPersonSyncPageVO syncPersonFromUserList(int current, int size);
+
+    /**
+     * 按页从 OA 公司接口同步公司
+     *
+     * @param current 当前页，从 1 开始
+     * @param size    每页条数
+     * @return 本页同步结果
+     */
+    OaOrgSyncPageVO syncCompanyPage(int current, int size);
+
+    /**
+     * 按页从 OA 部门接口同步部门；最后一页完成后更新祖级列表
+     *
+     * @param current 当前页，从 1 开始
+     * @param size    每页条数
+     * @return 本页同步结果
+     */
+    OaOrgSyncPageVO syncDepartmentPage(int current, int size);
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/CurrencyServiceImpl.java

@@ -125,6 +125,8 @@ public class CurrencyServiceImpl extends BaseServiceImpl<CurrencyMapper, Currenc
 			CurrencyExcel excel = data.get(index);
 			try {
 				Currency currency = Objects.requireNonNull(BeanUtil.copyProperties(excel, Currency.class));
+				currency.setEffectiveDate(org.springblade.common.excel.LenientDateParser.parseDate(excel.getEffectiveDate(), "生效日期"));
+				currency.setExpiryDate(org.springblade.common.excel.LenientDateParser.parseDate(excel.getExpiryDate(), "失效日期"));
 				currency.setDataSource(SOURCE_BATCH);
 				currency.setStatus(STATUS_ENABLED);
 				prepare(currency, SOURCE_BATCH);

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -46,6 +46,7 @@ import org.springblade.system.cache.SysCache;
 import org.springblade.system.mapper.DeptMapper;
 import org.springblade.system.pojo.entity.Dept;
 import org.springblade.system.pojo.entity.User;
+import org.springblade.system.pojo.enums.DeptCategory;
 import org.springblade.system.pojo.vo.DeptVO;
 import org.springblade.system.pojo.vo.UserVO;
 import org.springblade.system.props.IamSyncProperties;
@@ -53,6 +54,7 @@ import org.springblade.system.service.IDeptService;
 import org.springblade.system.service.IUserService;
 import org.springblade.system.wrapper.DeptWrapper;
 import org.springblade.system.wrapper.UserWrapper;
+import org.springblade.thirdparty.oa.constant.OAConstant;
 import org.springblade.thirdparty.oa.constant.OAConvertConstant;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -232,6 +234,21 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		return removeByIds(idList);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int clearNonTopDepts() {
+		Long nonTopCount = this.count(Wrappers.<Dept>lambdaQuery()
+			.isNotNull(Dept::getParentId)
+			.ne(Dept::getParentId, BladeConstant.TOP_PARENT_ID));
+		if (nonTopCount == null || nonTopCount == 0L) {
+			return 0;
+		}
+		this.remove(Wrappers.<Dept>lambdaQuery()
+			.isNotNull(Dept::getParentId)
+			.ne(Dept::getParentId, BladeConstant.TOP_PARENT_ID));
+		return nonTopCount.intValue();
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean submit(Dept dept) {
@@ -451,8 +468,12 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 	}
 
 	private void validateDeptCategory(Dept dept, Dept parent) {
+		// 顶级组织不要求选择上级组织
 		if (parent == null) {
-			throw new ServiceException("请选择上级组织");
+			if (Integer.valueOf(6).equals(dept.getDeptCategory()) && Func.isEmpty(dept.getCarrierCustomerId())) {
+				throw new ServiceException("请选择承运商");
+			}
+			return;
 		}
 		List<Integer> allowedCategories;
 		if (BladeConstant.TOP_PARENT_ID.equals(parent.getParentId())) {
@@ -483,13 +504,24 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		if (deptCode.length() > 30) {
 			throw new ServiceException("组织编码不能超过30个字符");
 		}
-		if (parent == null || StringUtil.isBlank(parent.getDeptCode())) {
+		// 顶级组织不依赖上级编码
+		if (parent == null) {
+			this.ensureDeptCodeUnique(dept, deptCode);
+			dept.setDeptCode(deptCode);
+			return;
+		}
+		if (StringUtil.isBlank(parent.getDeptCode())) {
 			throw new ServiceException("请选择已配置组织编码的上级组织");
 		}
 		String pattern = Pattern.quote(parent.getDeptCode()) + "-\\d+";
 		if (!deptCode.matches(pattern)) {
 			throw new ServiceException("组织编码格式应为：上级编码-分段数字");
 		}
+		this.ensureDeptCodeUnique(dept, deptCode);
+		dept.setDeptCode(deptCode);
+	}
+
+	private void ensureDeptCodeUnique(Dept dept, String deptCode) {
 		LambdaQueryWrapper<Dept> queryWrapper = Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptCode, deptCode);
 		if (Func.isNotEmpty(dept.getId())) {
 			queryWrapper.ne(Dept::getId, dept.getId());
@@ -497,7 +529,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		if (baseMapper.selectCount(queryWrapper) > 0) {
 			throw new ServiceException("组织编码已存在");
 		}
-		dept.setDeptCode(deptCode);
 	}
 
 	@Override
@@ -540,24 +571,243 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		return UserWrapper.build().listVO(userList);
 	}
 
-	/**
-	 * 统一的租户范围过滤：超管放行，其他用户强制限定为当前会话租户。
-	 */
-	private void applyTenantScope(QueryWrapper<Dept> queryWrapper) {
-		if (!AuthUtil.isAdministrator()) {
-			queryWrapper.lambda().eq(Dept::getTenantId, AuthUtil.getTenantId());
-		}
-	}
-
-
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void updateAncestors(Date startTime) {
-		// 1. 查询需要更新祖级列表的部门
-		List<Dept> list = this.list(Wrappers.<Dept>lambdaQuery()
-			// 祖级列表为空
+		this.refreshAncestors(false, startTime);
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public void rebuildOaHierarchy() {
+		List<Dept> oaDeptList = this.list(Wrappers.<Dept>lambdaQuery()
+			.isNotNull(Dept::getOaId)
+			.ne(Dept::getOaId, ""));
+		if (CollectionUtil.isEmpty(oaDeptList)) {
+			log.info("没有记录OA主键的组织，跳过层级重建");
+			return;
+		}
+		Map<String, Dept> companyByOaId = this.indexByOaId(oaDeptList, DeptCategory.COMPANY.getCode());
+		Map<String, Dept> departmentByOaId = this.indexByOaId(oaDeptList, DeptCategory.DEPT.getCode());
+		Map<Long, Long> desiredParentIdMap = new LinkedHashMap<>();
+		Map<Long, String> desiredParentCodeMap = new HashMap<>();
+		for (Dept dept : oaDeptList) {
+			OaParentLink parentLink = this.resolveOaParentLink(dept, companyByOaId, departmentByOaId);
+			if (parentLink == null) {
+				continue;
+			}
+			desiredParentIdMap.put(dept.getId(), parentLink.parentId());
+			desiredParentCodeMap.put(dept.getId(), parentLink.parentCode());
+		}
+		Set<Long> cyclicIds = this.findCyclicDeptIds(desiredParentIdMap);
+		if (CollectionUtil.isNotEmpty(cyclicIds)) {
+			log.warn("检测到OA组织循环引用，跳过层级重建 ids={}", cyclicIds);
+			cyclicIds.forEach(cyclicId -> {
+				desiredParentIdMap.remove(cyclicId);
+				desiredParentCodeMap.remove(cyclicId);
+			});
+		}
+		List<Dept> updateList = new ArrayList<>();
+		for (Dept dept : oaDeptList) {
+			Long parentId = desiredParentIdMap.get(dept.getId());
+			if (parentId == null) {
+				continue;
+			}
+			String parentCode = desiredParentCodeMap.get(dept.getId());
+			if (Objects.equals(parentId, dept.getParentId()) && StringUtil.equals(parentCode, dept.getParentCode())) {
+				continue;
+			}
+			Dept updateParam = new Dept();
+			updateParam.setId(dept.getId());
+			updateParam.setParentId(parentId);
+			updateParam.setParentCode(parentCode);
+			updateList.add(updateParam);
+		}
+		if (CollectionUtil.isNotEmpty(updateList)) {
+			this.updateBatchById(updateList);
+			log.info("按OA主键重建组织层级，更新父子关系{}条", updateList.size());
+		} else {
+			log.info("OA组织层级已是最新，无需调整父子关系");
+		}
+		this.refreshAncestors(true, null);
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public int removeOaOrphansWithoutParent() {
+		List<Dept> oaDeptList = this.list(Wrappers.<Dept>lambdaQuery()
+			.isNotNull(Dept::getOaId)
+			.ne(Dept::getOaId, ""));
+		if (CollectionUtil.isEmpty(oaDeptList)) {
+			return 0;
+		}
+		Map<String, Dept> companyByOaId = this.indexByOaId(oaDeptList, DeptCategory.COMPANY.getCode());
+		Map<String, Dept> departmentByOaId = this.indexByOaId(oaDeptList, DeptCategory.DEPT.getCode());
+		Set<Long> deleteIds = new HashSet<>();
+		for (Dept dept : oaDeptList) {
+			String parentOaId = dept.getOaSupSubComId();
+			// 上级为空或为 0：视为本地锚点/根级，不作为孤儿删除
+			if (StringUtil.isBlank(parentOaId) || OAConstant.ROOT_COMPANY_ID.equals(parentOaId)) {
+				continue;
+			}
+			boolean parentExists;
+			if (DeptCategory.COMPANY.getCode().equals(dept.getDeptCategory())) {
+				parentExists = companyByOaId.containsKey(parentOaId);
+			} else {
+				parentExists = departmentByOaId.containsKey(parentOaId) || companyByOaId.containsKey(parentOaId);
+			}
+			if (!parentExists) {
+				deleteIds.add(dept.getId());
+			}
+		}
+		if (CollectionUtil.isEmpty(deleteIds)) {
+			log.info("没有需要清理的OA孤儿组织");
+			return 0;
+		}
+		// 按 OA 上级关系级联：上级被删则子级一并删除
+		boolean oaCascadeChanged = true;
+		while (oaCascadeChanged) {
+			oaCascadeChanged = false;
+			for (Dept dept : oaDeptList) {
+				if (deleteIds.contains(dept.getId())) {
+					continue;
+				}
+				String parentOaId = dept.getOaSupSubComId();
+				if (StringUtil.isBlank(parentOaId) || OAConstant.ROOT_COMPANY_ID.equals(parentOaId)) {
+					continue;
+				}
+				Dept parent = DeptCategory.COMPANY.getCode().equals(dept.getDeptCategory())
+					? companyByOaId.get(parentOaId)
+					: Optional.ofNullable(departmentByOaId.get(parentOaId)).orElse(companyByOaId.get(parentOaId));
+				if (parent != null && deleteIds.contains(parent.getId())) {
+					deleteIds.add(dept.getId());
+					oaCascadeChanged = true;
+				}
+			}
+		}
+		// 按本地 parent_id 再级联一轮，清掉挂在已删节点下的子树
+		List<Dept> allDeptList = this.list();
+		boolean parentIdCascadeChanged = true;
+		while (parentIdCascadeChanged) {
+			parentIdCascadeChanged = false;
+			for (Dept dept : allDeptList) {
+				if (deleteIds.contains(dept.getId())) {
+					continue;
+				}
+				if (dept.getParentId() != null && deleteIds.contains(dept.getParentId())) {
+					deleteIds.add(dept.getId());
+					parentIdCascadeChanged = true;
+				}
+			}
+		}
+		this.removeByIds(deleteIds);
+		log.info("删除OA层级无法挂载的组织{}条", deleteIds.size());
+		return deleteIds.size();
+	}
+
+	/**
+	 * 按机构类型建立 OA 主键索引
+	 */
+	private Map<String, Dept> indexByOaId(List<Dept> oaDeptList, Integer deptCategory) {
+		Map<String, Dept> oaIdMap = new HashMap<>();
+		for (Dept dept : oaDeptList) {
+			if (!Objects.equals(deptCategory, dept.getDeptCategory()) || StringUtil.isBlank(dept.getOaId())) {
+				continue;
+			}
+			Dept previous = oaIdMap.put(dept.getOaId(), dept);
+			if (previous != null) {
+				log.warn("OA主键重复，层级重建使用后一条 category={} oaId={} id={} previousId={}",
+					dept.getDeptCategory(), dept.getOaId(), dept.getId(), previous.getId());
+			}
+		}
+		return oaIdMap;
+	}
+
+	/**
+	 * 根据 OA 上级主键解析本系统父级
+	 */
+	private OaParentLink resolveOaParentLink(Dept dept, Map<String, Dept> companyByOaId, Map<String, Dept> departmentByOaId) {
+		String parentOaId = dept.getOaSupSubComId();
+		boolean rootParent = StringUtil.isBlank(parentOaId) || OAConstant.ROOT_COMPANY_ID.equals(parentOaId);
+		if (DeptCategory.COMPANY.getCode().equals(dept.getDeptCategory())) {
+			if (rootParent) {
+				return new OaParentLink(OAConvertConstant.ROOT_PARENT_ID, OAConstant.ROOT_COMPANY_ID);
+			}
+			Dept parent = companyByOaId.get(parentOaId);
+			if (parent == null || parent.getId() == null || Objects.equals(parent.getId(), dept.getId())) {
+				log.warn("未找到上级公司，跳过层级重建 oaId={} oaSupSubComId={} deptId={}",
+					dept.getOaId(), parentOaId, dept.getId());
+				return null;
+			}
+			return new OaParentLink(parent.getId(), this.resolveParentCode(parent, OAConvertConstant.COMPANY_OA_PREFIX, parentOaId));
+		}
+		if (!DeptCategory.DEPT.getCode().equals(dept.getDeptCategory())) {
+			return null;
+		}
+		if (rootParent) {
+			log.warn("部门缺少上级OA主键，跳过层级重建 oaId={} deptId={}", dept.getOaId(), dept.getId());
+			return null;
+		}
+		boolean parentIsDepartment = StringUtil.isNotBlank(dept.getParentCode())
+			&& dept.getParentCode().startsWith(OAConvertConstant.DEPARTMENT_OA_PREFIX);
+		boolean parentIsCompany = StringUtil.isNotBlank(dept.getParentCode())
+			&& dept.getParentCode().startsWith(OAConvertConstant.COMPANY_OA_PREFIX);
+		Dept parent;
+		if (parentIsDepartment) {
+			parent = departmentByOaId.get(parentOaId);
+		} else if (parentIsCompany) {
+			parent = companyByOaId.get(parentOaId);
+		} else {
+			parent = departmentByOaId.get(parentOaId);
+			if (parent == null) {
+				parent = companyByOaId.get(parentOaId);
+			}
+		}
+		if (parent == null || parent.getId() == null || Objects.equals(parent.getId(), dept.getId())) {
+			log.warn("未找到上级组织，跳过层级重建 oaId={} oaSupSubComId={} deptId={}",
+				dept.getOaId(), parentOaId, dept.getId());
+			return null;
+		}
+		String prefix = DeptCategory.DEPT.getCode().equals(parent.getDeptCategory())
+			? OAConvertConstant.DEPARTMENT_OA_PREFIX : OAConvertConstant.COMPANY_OA_PREFIX;
+		return new OaParentLink(parent.getId(), this.resolveParentCode(parent, prefix, parentOaId));
+	}
+
+	private String resolveParentCode(Dept parent, String prefix, String parentOaId) {
+		if (StringUtil.isNotBlank(parent.getDeptCode())) {
+			return parent.getDeptCode();
+		}
+		return prefix + parentOaId;
+	}
+
+	/**
+	 * 找出父子关系成环的部门
+	 */
+	private Set<Long> findCyclicDeptIds(Map<Long, Long> parentIdMap) {
+		Set<Long> cyclicIds = new HashSet<>();
+		for (Long deptId : parentIdMap.keySet()) {
+			Set<Long> visiting = new HashSet<>();
+			Long currentId = deptId;
+			while (currentId != null && !OAConvertConstant.ROOT_PARENT_ID.equals(currentId)) {
+				if (!visiting.add(currentId)) {
+					cyclicIds.addAll(visiting);
+					break;
+				}
+				currentId = parentIdMap.get(currentId);
+			}
+		}
+		return cyclicIds;
+	}
+
+	/**
+	 * 刷新祖级列表
+	 *
+	 * @param refreshAll 是否刷新全部部门
+	 * @param startTime  增量起始时间，仅 refreshAll 为 false 时生效
+	 */
+	private void refreshAncestors(boolean refreshAll, Date startTime) {
+		List<Dept> list = refreshAll ? this.list() : this.list(Wrappers.<Dept>lambdaQuery()
 			.isNull(Dept::getAncestors)
-			// 开始时间不为空，查询同步时间大于开始时间或修改时间大于开始时间的数据
 			.or(startTime != null, wrapper -> wrapper.ge(Dept::getSyncTime, startTime))
 			.or(startTime != null, wrapper -> wrapper.ge(Dept::getUpdateTime, startTime))
 		);
@@ -565,29 +815,19 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 			log.info("需要更新祖级列表的部门为空");
 			return;
 		}
-		// 所有公司部门列表
-		List<DeptVO> allList = this.list().stream()
+		List<DeptVO> allList = (refreshAll ? list : this.list()).stream()
 			.map(dept -> BeanUtil.copyProperties(dept, DeptVO.class))
 			.toList();
-		// id对应的部门map
 		Map<Long, DeptVO> idDeptMap = allList.stream()
 			.collect(Collectors.toMap(DeptVO::getId, Function.identity(), (a, b) -> b));
-		// 获取根节点列表
 		List<DeptVO> rootList = getRootList(allList, idDeptMap);
-		// 计算祖级列表
 		setAncestors(rootList);
-
-		// 3. 更新祖级列表
 		List<Dept> updateParams = list.stream()
 			.filter(dept -> {
 				DeptVO vo = idDeptMap.get(dept.getId());
-				if (vo == null) {
+				if (vo == null || vo.getAncestors() == null) {
 					return false;
 				}
-				if (vo.getAncestors() == null) {
-					return false;
-				}
-				// 祖级列表和数据库的不一样的才需要更新
 				return !StringUtil.equals(vo.getAncestors(), dept.getAncestors());
 			})
 			.map(dept -> {
@@ -602,6 +842,21 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		}
 	}
 
+	/**
+	 * OA 上级链接
+	 */
+	private record OaParentLink(Long parentId, String parentCode) {
+	}
+
+	/**
+	 * 统一的租户范围过滤：超管放行，其他用户强制限定为当前会话租户。
+	 */
+	private void applyTenantScope(QueryWrapper<Dept> queryWrapper) {
+		if (!AuthUtil.isAdministrator()) {
+			queryWrapper.lambda().eq(Dept::getTenantId, AuthUtil.getTenantId());
+		}
+	}
+
 	/**
 	 *  获取根节点列表
 	 * @param allList

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MeasurementUnitServiceImpl.java

@@ -46,6 +46,7 @@ public class MeasurementUnitServiceImpl extends BaseServiceImpl<MeasurementUnitM
 
 	private static final int STATUS_ENABLED = 1;
 	private static final int STATUS_DISABLED = 2;
+	private static final int UNIT_CODE_MAX_LENGTH = 50;
 	private static final int UNIT_NAME_MAX_LENGTH = 50;
 	private static final int DIMENSION_MAX_LENGTH = 20;
 	private static final int REMARK_MAX_LENGTH = 200;
@@ -85,6 +86,7 @@ public class MeasurementUnitServiceImpl extends BaseServiceImpl<MeasurementUnitM
 	}
 
 	private void prepare(MeasurementUnit measurementUnit) {
+		measurementUnit.setUnitCode(trimToEmpty(measurementUnit.getUnitCode()));
 		measurementUnit.setUnitName(trimToEmpty(measurementUnit.getUnitName()));
 		measurementUnit.setDimension(trimToEmpty(measurementUnit.getDimension()));
 		measurementUnit.setRemark(trimToNull(measurementUnit.getRemark()));
@@ -94,6 +96,12 @@ public class MeasurementUnitServiceImpl extends BaseServiceImpl<MeasurementUnitM
 	}
 
 	private void validate(MeasurementUnit measurementUnit) {
+		if (Func.isEmpty(measurementUnit.getUnitCode())) {
+			throw new ServiceException("计量单位编码不能为空");
+		}
+		if (measurementUnit.getUnitCode().length() > UNIT_CODE_MAX_LENGTH) {
+			throw new ServiceException("计量单位编码不能超过50字");
+		}
 		if (Func.isEmpty(measurementUnit.getUnitName())) {
 			throw new ServiceException("计量单位不能为空");
 		}
@@ -115,9 +123,22 @@ public class MeasurementUnitServiceImpl extends BaseServiceImpl<MeasurementUnitM
 			&& !Objects.equals(measurementUnit.getStatus(), STATUS_DISABLED)) {
 			throw new ServiceException("启停状态不正确");
 		}
+		validateUniqueUnitCode(measurementUnit);
 		validateUniqueUnitName(measurementUnit);
 	}
 
+	private void validateUniqueUnitCode(MeasurementUnit measurementUnit) {
+		LambdaQueryWrapper<MeasurementUnit> queryWrapper = Wrappers.<MeasurementUnit>lambdaQuery()
+			.eq(MeasurementUnit::getUnitCode, measurementUnit.getUnitCode())
+			.eq(MeasurementUnit::getIsDeleted, 0);
+		if (Func.isNotEmpty(measurementUnit.getId())) {
+			queryWrapper.ne(MeasurementUnit::getId, measurementUnit.getId());
+		}
+		if (count(queryWrapper) > 0L) {
+			throw new ServiceException("该计量单位编码已存在");
+		}
+	}
+
 	private void validateUniqueUnitName(MeasurementUnit measurementUnit) {
 		LambdaQueryWrapper<MeasurementUnit> queryWrapper = Wrappers.<MeasurementUnit>lambdaQuery()
 			.eq(MeasurementUnit::getUnitName, measurementUnit.getUnitName())

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OASyncServiceImpl.java

@@ -18,6 +18,7 @@ import org.springblade.system.log.ComposeLogUtil;
 import org.springblade.system.pojo.entity.*;
 import org.springblade.system.pojo.enums.DataSync;
 import org.springblade.system.pojo.enums.DeptCategory;
+import org.springblade.system.pojo.vo.OaOrgSyncPageVO;
 import org.springblade.system.pojo.vo.OaPersonSyncPageVO;
 import org.springblade.system.service.*;
 import org.springblade.system.util.DataSyncRecordUtils;
@@ -73,10 +74,18 @@ public class OASyncServiceImpl implements IOASyncService {
             Date startTime = this.syncAndRecord(DataSyncRecordUtils::createOAOrgFetch, queryStartTime -> {
                 // 1. 同步公司
                 this.syncCompany(queryStartTime);
+                // 公司分批入库后，重建层级并清理无法挂载的公司
+                deptService.rebuildOaHierarchy();
+                deptService.removeOaOrphansWithoutParent();
                 // 2. 同步部门
                 this.syncDept(queryStartTime);
-                // 2. 更新部门祖级列表
+                // 3. 分批写入完成后，按 OA 主键重建组织、部门层级
+                deptService.rebuildOaHierarchy();
+                deptService.removeOaOrphansWithoutParent();
+                // 4. 更新部门祖级列表
                 deptService.updateAncestors(queryStartTime);
+                CacheUtil.clear(SYS_CACHE);
+                CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
             }, syncAll);
             // 2. 推送mk
             mkPushService.pushOrgAndRecord(startTime);
@@ -124,6 +133,28 @@ public class OASyncServiceImpl implements IOASyncService {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public OaOrgSyncPageVO syncCompanyPage(int current, int size) {
+        try {
+            ComposeLogUtil.addLog(log);
+            return this.syncCompanyFromOaPage(current, size);
+        } finally {
+            ComposeLogUtil.removeLastLog();
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public OaOrgSyncPageVO syncDepartmentPage(int current, int size) {
+        try {
+            ComposeLogUtil.addLog(log);
+            return this.syncDepartmentFromOaPage(current, size);
+        } finally {
+            ComposeLogUtil.removeLastLog();
+        }
+    }
+
     /**
      * 同步并记录
      *
@@ -166,20 +197,15 @@ public class OASyncServiceImpl implements IOASyncService {
         // 未处理的数据
         List<Dept> notHandleList = new ArrayList<>();
         // 1. 设置查询参数
-        OACompanySearch companySearch = new OACompanySearch();
-        companySearch.setCurPage(1);
-        if (startTime != null) {
-            // 开始时间不为空，设置修改时间参数
-            companySearch.setModified(DateUtil.format(startTime, DateUtil.PATTERN_DATETIME));
-        }
+        OACompanySearch companySearch = buildCompanySearch(startTime);
         // 2. 分页查询并处理数据
         OAUtils.pageSyncHandler(companySearch, param -> oaClient.queryCompanyPage(new OASearch<>(param)), response -> {
             ComposeLogUtil.getLastLog().error("调用OA接口查询公司信息失败 {}", JSON.toJSONString(response));
             return new ServiceException("调用OA接口查询公司信息失败");
         }, 10000, ComposeLogUtil.getLastLog()::info).accept(list -> {
             // 处理数据
-            List<Dept> deptList = handleCompany(list);
-            notHandleList.addAll(deptList);
+            OrgSyncCount syncCount = handleCompany(list, false);
+            notHandleList.addAll(syncCount.getNotHandledList());
         });
         // 3. 未处理的数据
         if (CollectionUtil.isNotEmpty(notHandleList)) {
@@ -195,7 +221,7 @@ public class OASyncServiceImpl implements IOASyncService {
      * @param startTime 查询开始时间
      */
     private void syncDept(Date startTime) {
-        String subCompanyIds = getSubCompanyIds();
+        String subCompanyIds = getOaSubCompanyIds(false);
         if (StringUtils.isEmpty(subCompanyIds)) {
             ComposeLogUtil.getLastLog().warn("未查询到子公司查询参数");
             return;
@@ -203,21 +229,15 @@ public class OASyncServiceImpl implements IOASyncService {
         // 未处理的数据
         List<Dept> notHandleList = new ArrayList<>();
         // 1. 设置查询参数
-        OADepartmentSearch departmentSearch = new OADepartmentSearch();
-        departmentSearch.setCurPage(1);
-        departmentSearch.setSubcompanyid1(subCompanyIds);
-        if (startTime != null) {
-            // 开始时间不为空，设置修改时间参数
-            departmentSearch.setModified(DateUtil.format(startTime, DateUtil.PATTERN_DATETIME));
-        }
+        OADepartmentSearch departmentSearch = buildDepartmentSearch(startTime, subCompanyIds);
         // 2. 分页查询并处理数据
         OAUtils.pageSyncHandler(departmentSearch, param -> oaClient.queryDepartmentPage(new OASearch<>(param)), response -> {
             ComposeLogUtil.getLastLog().error("调用OA接口查询部门信息失败 {}", JSON.toJSONString(response));
             return new ServiceException("调用OA接口查询部门信息失败");
         }, 10000, ComposeLogUtil.getLastLog()::info).accept(list -> {
             // 处理数据
-            List<Dept> deptList = handleDept(list);
-            notHandleList.addAll(deptList);
+            OrgSyncCount syncCount = handleDept(list, false);
+            notHandleList.addAll(syncCount.getNotHandledList());
         });
         // 3. 未处理的数据
         if (CollectionUtil.isNotEmpty(notHandleList)) {
@@ -266,7 +286,7 @@ public class OASyncServiceImpl implements IOASyncService {
      */
     private OaPersonSyncPageVO syncPersonFromOaPage(int current, int size) {
         int pageNo = current < 1 ? 1 : current;
-        int pageSize = size < 1 ? 50 : Math.min(size, 200);
+        int pageSize = size < 1 ? 20 : Math.min(size, 200);
         OAPersonSearch personSearch = buildPersonSearch(null);
         personSearch.setCurPage(pageNo);
         personSearch.setPageSize(pageSize);
@@ -300,6 +320,146 @@ public class OASyncServiceImpl implements IOASyncService {
         return pageVO;
     }
 
+    /**
+     * 按页从 OA 公司接口同步公司
+     *
+     * @param current 当前页
+     * @param size    每页条数
+     * @return 本页同步结果
+     */
+    private OaOrgSyncPageVO syncCompanyFromOaPage(int current, int size) {
+        int pageNo = current < 1 ? 1 : current;
+        int pageSize = size < 1 ? 20 : Math.min(size, 200);
+        OACompanySearch companySearch = buildCompanySearch(null);
+        companySearch.setCurPage(pageNo);
+        companySearch.setPageSize(pageSize);
+        OAResponse<OACompanyResponse> oaResponse = oaClient.queryCompanyPage(new OASearch<>(companySearch));
+        if (oaResponse == null || !OAConstant.OA_SUCCESS_CODE.equals(oaResponse.getCode()) || oaResponse.getData() == null) {
+            ComposeLogUtil.getLastLog().error("调用OA接口查询公司信息失败 {}", JSON.toJSONString(oaResponse));
+            throw new ServiceException("调用OA接口查询公司信息失败");
+        }
+        OAResponseData<OACompanyResponse> responseData = oaResponse.getData();
+        List<OACompanyResponse> oaCompanies = responseData.getDataList() == null
+                ? Collections.emptyList() : responseData.getDataList();
+        long totalSize = responseData.getTotalSize() == null ? 0L : responseData.getTotalSize();
+        OrgSyncCount syncCount = handleCompany(oaCompanies, true);
+        if (CollectionUtil.isNotEmpty(syncCount.getNotHandledList())) {
+            ComposeLogUtil.getLastLog().warn("同步公司，本页未处理数据：{}", JSON.toJSONString(syncCount.getNotHandledList()));
+        }
+        OaOrgSyncPageVO pageVO = buildOrgSyncPageVO("company", pageNo, pageSize, totalSize, oaCompanies.size(), syncCount);
+        if (Boolean.TRUE.equals(pageVO.getFinished())) {
+            // 公司全部分批入库后：重建层级，并删除上级不存在的数据
+            deptService.rebuildOaHierarchy();
+            deptService.removeOaOrphansWithoutParent();
+        }
+        CacheUtil.clear(SYS_CACHE);
+        CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
+        ComposeLogUtil.getLastLog().info("OA公司分页同步完成 {}/{}，成功{}，跳过{}",
+                pageNo, totalSize, syncCount.getSyncedCount(), syncCount.getSkippedCount());
+        return pageVO;
+    }
+
+    /**
+     * 按页从 OA 部门接口同步部门
+     *
+     * @param current 当前页
+     * @param size    每页条数
+     * @return 本页同步结果
+     */
+    private OaOrgSyncPageVO syncDepartmentFromOaPage(int current, int size) {
+        int pageNo = current < 1 ? 1 : current;
+        int pageSize = size < 1 ? 20 : Math.min(size, 200);
+        String subCompanyIds = getOaSubCompanyIds(true);
+        if (StringUtils.isEmpty(subCompanyIds)) {
+            ComposeLogUtil.getLastLog().warn("未查询到已同步的OA公司，跳过部门同步");
+            OaOrgSyncPageVO emptyPageVO = buildOrgSyncPageVO("department", pageNo, pageSize, 0L, 0, OrgSyncCount.empty());
+            emptyPageVO.setFinished(true);
+            return emptyPageVO;
+        }
+        OADepartmentSearch departmentSearch = buildDepartmentSearch(null, subCompanyIds);
+        departmentSearch.setCurPage(pageNo);
+        departmentSearch.setPageSize(pageSize);
+        OAResponse<OADepartmentResponse> oaResponse = oaClient.queryDepartmentPage(new OASearch<>(departmentSearch));
+        if (oaResponse == null || !OAConstant.OA_SUCCESS_CODE.equals(oaResponse.getCode()) || oaResponse.getData() == null) {
+            ComposeLogUtil.getLastLog().error("调用OA接口查询部门信息失败 {}", JSON.toJSONString(oaResponse));
+            throw new ServiceException("调用OA接口查询部门信息失败");
+        }
+        OAResponseData<OADepartmentResponse> responseData = oaResponse.getData();
+        List<OADepartmentResponse> oaDepartments = responseData.getDataList() == null
+                ? Collections.emptyList() : responseData.getDataList();
+        long totalSize = responseData.getTotalSize() == null ? 0L : responseData.getTotalSize();
+        OrgSyncCount syncCount = handleDept(oaDepartments, true);
+        if (CollectionUtil.isNotEmpty(syncCount.getNotHandledList())) {
+            ComposeLogUtil.getLastLog().warn("同步部门，本页未处理数据：{}", JSON.toJSONString(syncCount.getNotHandledList()));
+        }
+        OaOrgSyncPageVO pageVO = buildOrgSyncPageVO("department", pageNo, pageSize, totalSize, oaDepartments.size(), syncCount);
+        if (Boolean.TRUE.equals(pageVO.getFinished())) {
+            // 部门分批同步完成后，重建层级、清理无法挂载数据并刷新祖级列表
+            deptService.rebuildOaHierarchy();
+            deptService.removeOaOrphansWithoutParent();
+            deptService.updateAncestors(null);
+        }
+        CacheUtil.clear(SYS_CACHE);
+        CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
+        ComposeLogUtil.getLastLog().info("OA部门分页同步完成 {}/{}，成功{}，跳过{}",
+                pageNo, totalSize, syncCount.getSyncedCount(), syncCount.getSkippedCount());
+        return pageVO;
+    }
+
+    /**
+     * 组装组织分页同步结果
+     */
+    private OaOrgSyncPageVO buildOrgSyncPageVO(String stage, int pageNo, int pageSize, long totalSize,
+                                               int fetchedCount, OrgSyncCount syncCount) {
+        OaOrgSyncPageVO pageVO = new OaOrgSyncPageVO();
+        pageVO.setStage(stage);
+        pageVO.setCurrent(pageNo);
+        pageVO.setSize(pageSize);
+        pageVO.setTotal(totalSize);
+        pageVO.setFetchedCount(fetchedCount);
+        pageVO.setSyncedCount(syncCount.getSyncedCount());
+        pageVO.setSkippedCount(syncCount.getSkippedCount());
+        boolean finished = fetchedCount == 0
+                || fetchedCount < pageSize
+                || (long) pageNo * pageSize >= totalSize;
+        pageVO.setFinished(finished);
+        return pageVO;
+    }
+
+    /**
+     * 组装 OA 公司分页查询参数
+     *
+     * @param startTime 增量查询开始时间
+     * @return 查询参数
+     */
+    private OACompanySearch buildCompanySearch(Date startTime) {
+        OACompanySearch companySearch = new OACompanySearch();
+        companySearch.setCurPage(1);
+        companySearch.setPageSize(20);
+        if (startTime != null) {
+            companySearch.setModified(DateUtil.format(startTime, DateUtil.PATTERN_DATETIME));
+        }
+        return companySearch;
+    }
+
+    /**
+     * 组装 OA 部门分页查询参数
+     *
+     * @param startTime     增量查询开始时间
+     * @param subCompanyIds 子公司 id 列表
+     * @return 查询参数
+     */
+    private OADepartmentSearch buildDepartmentSearch(Date startTime, String subCompanyIds) {
+        OADepartmentSearch departmentSearch = new OADepartmentSearch();
+        departmentSearch.setCurPage(1);
+        departmentSearch.setPageSize(20);
+        departmentSearch.setSubcompanyid1(subCompanyIds);
+        if (startTime != null) {
+            departmentSearch.setModified(DateUtil.format(startTime, DateUtil.PATTERN_DATETIME));
+        }
+        return departmentSearch;
+    }
+
     /**
      * 组装 OA 人员分页查询参数
      *
@@ -309,7 +469,7 @@ public class OASyncServiceImpl implements IOASyncService {
     private OAPersonSearch buildPersonSearch(Date startTime) {
         OAPersonSearch personSearch = new OAPersonSearch();
         personSearch.setCurPage(1);
-        personSearch.setPageSize(200);
+        personSearch.setPageSize(20);
         personSearch.setCreated("");
         personSearch.setWorkcode("");
         personSearch.setSubcompanyid1("");
@@ -324,70 +484,94 @@ public class OASyncServiceImpl implements IOASyncService {
 
     /**
      *  处理oa公司
-     * @param oaCompanies
-     * @return 未处理的数据
+     * @param oaCompanies OA公司列表
+     * @param syncAll true=自动同步时不过滤字典白名单；false=仅同步配置的公司名称
+     * @return 同步统计
      */
-    private List<Dept> handleCompany(List<OACompanyResponse> oaCompanies) {
+    private OrgSyncCount handleCompany(List<OACompanyResponse> oaCompanies, boolean syncAll) {
         if (CollectionUtil.isEmpty(oaCompanies)) {
-            // 数据为空，直接返回
-            return Collections.emptyList();
+            return OrgSyncCount.empty();
         }
         // 获取需要的公司名称
-        Set<String> companyNames = getCompanyNames();
+        Set<String> companyNames = syncAll ? Collections.emptySet() : getCompanyNames();
         // 转换数据
         List<Dept> allParam = oaCompanies.stream()
-                // 筛选只要需要的公司
-                .filter(company -> companyNames.contains(company.getSubcompanyname()))
+                // 强制跳过上级公司为 0 的数据
+                .filter(company -> !OAConstant.ROOT_COMPANY_ID.equals(company.getSupsubcomid()))
+                // 非全量同步时，筛选只要配置的公司
+                .filter(company -> syncAll || companyNames.contains(company.getSubcompanyname()))
                 .map(deptConvert::company2dept)
                 .toList();
+        int filteredSkipCount = oaCompanies.size() - allParam.size();
+        if (CollectionUtil.isEmpty(allParam)) {
+            return new OrgSyncCount(0, filteredSkipCount, Collections.emptyList());
+        }
 
         // 查询数据库的部门，转换成map
         Map<String, Long> deptMap = getAllCompanyDeptMap();
 
         // 处理部门
-        return handleDept(allParam, deptMap, DeptCategory.COMPANY);
+        List<Dept> notHandledList = handleDept(allParam, deptMap, DeptCategory.COMPANY);
+        int syncedCount = allParam.size() - notHandledList.size();
+        int skippedCount = filteredSkipCount + notHandledList.size();
+        return new OrgSyncCount(syncedCount, skippedCount, notHandledList);
     }
 
     /**
      *  处理oa部门
-     * @param oaDepts
-     * @return 未处理的数据
+     * @param oaDepts OA部门列表
+     * @param syncAll true=自动同步时不过滤根公司部门白名单；false=沿用原过滤规则
+     * @return 同步统计
      */
-    private List<Dept> handleDept(List<OADepartmentResponse> oaDepts) {
+    private OrgSyncCount handleDept(List<OADepartmentResponse> oaDepts, boolean syncAll) {
         if (CollectionUtil.isEmpty(oaDepts)) {
-            // 数据为空，直接返回
-            return Collections.emptyList();
+            return OrgSyncCount.empty();
         }
         // 查询所有公司的编码和id的map
         Map<String, Long> companyDeptMap = getAllCompanyDeptMap();
         // 根公司id
         String rootCompanyId = getRootCompanyId();
-        if (rootCompanyId == null) {
-            return Collections.emptyList();
+        if (!syncAll && rootCompanyId == null) {
+            return new OrgSyncCount(0, oaDepts.size(), Collections.emptyList());
         }
         // 根公司下要同步的部门名称
-        Set<String> rootCompanyDeptNames = getRootCompanyDeptNames();
+        Set<String> rootCompanyDeptNames = syncAll ? Collections.emptySet() : getRootCompanyDeptNames();
         // 转换数据
         List<Dept> allParam = oaDepts.stream()
-                // 部门的公司不是根公司，或者部门名称在根公司下需要同步的部门列表中，且是根部门
-                .filter(oaDept -> !rootCompanyId.equals(oaDept.getSubcompanyid1()) || (OAConstant.ROOT_COMPANY_ID.equals(oaDept.getSupdepid()) && rootCompanyDeptNames.contains(oaDept.getDepartmentname())))
+                // 全量同步时不过滤；否则：部门的公司不是根公司，或者部门名称在根公司下需要同步的部门列表中，且是根部门
+                .filter(oaDept -> syncAll
+                        || rootCompanyId == null
+                        || !rootCompanyId.equals(oaDept.getSubcompanyid1())
+                        || (OAConstant.ROOT_COMPANY_ID.equals(oaDept.getSupdepid()) && rootCompanyDeptNames.contains(oaDept.getDepartmentname())))
                 .map(dept -> deptConvert.dept2dept(dept, companyDeptMap))
                 .toList();
+        int filteredSkipCount = oaDepts.size() - allParam.size();
         if (CollectionUtil.isEmpty(allParam)) {
-            return Collections.emptyList();
+            return new OrgSyncCount(0, filteredSkipCount, Collections.emptyList());
         }
-        Set<String> deptCodes = allParam.stream()
-                .map(Dept::getDeptCode)
-                .collect(Collectors.toSet());
-        // 查询数据库的部门，转换成map
-        Map<String, Long> deptMap = deptService.list(Wrappers.<Dept>lambdaQuery()
+        Set<String> deptCodes = new HashSet<>();
+        allParam.forEach(dept -> {
+            if (StringUtils.isNotEmpty(dept.getDeptCode())) {
+                deptCodes.add(dept.getDeptCode());
+            }
+            if (StringUtils.isNotEmpty(dept.getParentCode())) {
+                deptCodes.add(dept.getParentCode());
+            }
+        });
+        // 查询数据库的部门，转换成map。包含本页及上级编码，便于命中已入库的上级
+        Map<String, Long> deptMap = deptCodes.isEmpty() ? new HashMap<>() : deptService.list(Wrappers.<Dept>lambdaQuery()
                         .eq(Dept::getDeptCategory, DeptCategory.DEPT.getCode())
                         .in(Dept::getDeptCode, deptCodes)
                 ).stream()
                 .filter(dept -> StringUtils.isNotEmpty(dept.getDeptCode()))
                 .collect(Collectors.toMap(Dept::getDeptCode, Dept::getId, (a, b) -> b));
+        // 公司编码也放入 map，根部门挂到公司时才能解析父级
+        companyDeptMap.forEach(deptMap::putIfAbsent);
         // 处理部门
-        return this.handleDept(allParam, deptMap, DeptCategory.DEPT);
+        List<Dept> notHandledList = this.handleDept(allParam, deptMap, DeptCategory.DEPT);
+        int syncedCount = allParam.size() - notHandledList.size();
+        int skippedCount = filteredSkipCount + notHandledList.size();
+        return new OrgSyncCount(syncedCount, skippedCount, notHandledList);
     }
 
     /**
@@ -410,14 +594,30 @@ public class OASyncServiceImpl implements IOASyncService {
             }
         });
 
-        // 重新把没有父id的数据设置一下父id
-        allParam.stream()
-                .filter(dept -> dept.getParentId() == null && deptMap.containsKey(dept.getDeptCode()))
-                .forEach(dept -> dept.setParentId(deptMap.get(dept.getParentCode())));
+        // 重新把没有父id的数据设置一下父id；上级尚未入库时，新增记录先挂到根节点，全部分批完成后重建层级并清理无法挂载的数据
+        int unresolvedParentCount = 0;
+        for (Dept dept : allParam) {
+            if (dept.getParentId() != null) {
+                continue;
+            }
+            Long parentId = deptMap.get(dept.getParentCode());
+            if (parentId != null) {
+                dept.setParentId(parentId);
+                continue;
+            }
+            unresolvedParentCount++;
+            if (!existsDeptIds.contains(dept.getId())) {
+                dept.setParentId(OAConvertConstant.ROOT_PARENT_ID);
+            }
+        }
+        if (unresolvedParentCount > 0) {
+            ComposeLogUtil.getLastLog().warn("同步{}时有{}条上级尚未入库，已先保存，分批结束后重建层级并清理无法挂载数据",
+                    deptCategory.getName(), unresolvedParentCount);
+        }
 
-        // 父id不为空，保存数据
+        // 父id不为空才新增；已存在的记录即使父id未解析也更新（空父id不会覆盖原值）
         List<Dept> list = allParam.stream()
-                .filter(dept -> dept.getParentId() != null)
+                .filter(dept -> dept.getParentId() != null || existsDeptIds.contains(dept.getId()))
                 .toList();
         // 不存在的新增
         List<Dept> addList = list.stream()
@@ -435,33 +635,88 @@ public class OASyncServiceImpl implements IOASyncService {
             ComposeLogUtil.getLastLog().info("批量修改{}：{}", deptCategory.getName(), updateList.size());
             deptService.updateBatchById(updateList);
         }
-        // 返回未处理的
+        // 返回仍未保存的数据
         return allParam.stream()
-                .filter(dept -> dept.getParentId() == null)
+                .filter(dept -> dept.getParentId() == null && !existsDeptIds.contains(dept.getId()))
                 .toList();
     }
 
     /**
-     *  获取oa查询参数，子公司id参数
-     * @return
+     * 组织同步统计
      */
-    private String getSubCompanyIds() {
+    private static class OrgSyncCount {
+        private final int syncedCount;
+        private final int skippedCount;
+        private final List<Dept> notHandledList;
+
+        private OrgSyncCount(int syncedCount, int skippedCount, List<Dept> notHandledList) {
+            this.syncedCount = syncedCount;
+            this.skippedCount = skippedCount;
+            this.notHandledList = notHandledList == null ? Collections.emptyList() : notHandledList;
+        }
+
+        private static OrgSyncCount empty() {
+            return new OrgSyncCount(0, 0, Collections.emptyList());
+        }
+
+        private int getSyncedCount() {
+            return syncedCount;
+        }
+
+        private int getSkippedCount() {
+            return skippedCount;
+        }
+
+        private List<Dept> getNotHandledList() {
+            return notHandledList;
+        }
+    }
+
+    /**
+     * 获取 OA 部门查询使用的子公司 id
+     *
+     * @param syncAll true=取已同步的全部 OA 公司；false=仅取字典配置的公司
+     * @return 逗号分隔的 OA 公司 id
+     */
+    private String getOaSubCompanyIds(boolean syncAll) {
+        List<Dept> companyList;
+        if (syncAll) {
+            companyList = deptService.list(Wrappers.<Dept>lambdaQuery()
+                    .eq(Dept::getDeptCategory, DeptCategory.COMPANY.getCode())
+            );
+        } else {
             Set<String> companyNames = this.getCompanyNames();
             if (companyNames.isEmpty()) {
                 return null;
             }
-        return deptService.list(Wrappers.<Dept>lambdaQuery()
-                        // 根据名称查询公司
+            companyList = deptService.list(Wrappers.<Dept>lambdaQuery()
                     .in(Dept::getDeptName, companyNames)
                     .eq(Dept::getDeptCategory, DeptCategory.COMPANY.getCode())
-                ).stream()
-                // 只要部门编码不为空，且包含了oa公司前缀的
-                .filter(dept -> StringUtils.isNotBlank(dept.getDeptCode()) && dept.getDeptCode().contains(OAConvertConstant.COMPANY_OA_PREFIX))
-                // 去掉oa公司前缀
-                .map(dept -> dept.getDeptCode().replace(OAConvertConstant.COMPANY_OA_PREFIX, ""))
+            );
+        }
+        return companyList.stream()
+                .map(this::resolveOaCompanyId)
+                .filter(StringUtils::isNotBlank)
+                .distinct()
                 .collect(Collectors.joining(","));
     }
 
+    /**
+     * 解析本地公司对应的 OA 公司 id
+     */
+    private String resolveOaCompanyId(Dept dept) {
+        if (dept == null) {
+            return null;
+        }
+        if (StringUtils.isNotBlank(dept.getOaId())) {
+            return dept.getOaId();
+        }
+        if (StringUtils.isNotBlank(dept.getDeptCode()) && dept.getDeptCode().startsWith(OAConvertConstant.COMPANY_OA_PREFIX)) {
+            return dept.getDeptCode().replace(OAConvertConstant.COMPANY_OA_PREFIX, "");
+        }
+        return null;
+    }
+
     /**
      *  获取默认角色id
      */

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/PortTerminalServiceImpl.java

@@ -35,6 +35,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.UserCache;
+import org.springblade.system.excel.ImportFailureException;
 import org.springblade.system.excel.PortTerminalExcel;
 import org.springblade.system.excel.PortTerminalExportExcel;
 import org.springblade.system.mapper.PortTerminalMapper;
@@ -45,17 +46,19 @@ import org.springblade.system.service.IPortTerminalService;
 import org.springblade.system.service.IRegionService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.io.Serial;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.TreeMap;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 /**
@@ -69,12 +72,10 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 
 	private static final String CATEGORY_PORT = "港口";
 	private static final String CATEGORY_TERMINAL = "码头";
-	private static final String SOURCE_INITIAL = "初始化录入";
-	private static final String SOURCE_INITIAL_IMPORT = "初始化导入";
+	private static final String SOURCE_INITIAL = "初始化导入";
 	private static final String SOURCE_INITIAL_OLD = "初始导入";
 	private static final String SOURCE_BATCH = "批量导入";
-	private static final String SOURCE_MANUAL = "手动录入";
-	private static final String SOURCE_MANUAL_OLD = "手工导入";
+	private static final String SOURCE_MANUAL = "手工导入";
 	private static final int STATUS_ENABLED = 1;
 	private static final int STATUS_DISABLED = 2;
 	private static final int CODE_MAX_LENGTH = 30;
@@ -141,270 +142,209 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 		if (Func.isEmpty(data)) {
 			throw new ServiceException("导入数据不能为空");
 		}
-		Map<Integer, PortTerminalExcel> errorMap = new TreeMap<>();
-		Map<String, Integer> codeCountMap = buildImportCodeCountMap(data);
-		importPortTerminalByCategory(data, codeCountMap, errorMap, true);
-		importPortTerminalByCategory(data, codeCountMap, errorMap, false);
-		if (Func.isNotEmpty(errorMap)) {
-			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+		// 全量校验：任何一行失败都整批回滚，因此先收集所有错误再统一抛出。
+		List<PortTerminalExcel> failureList = new ArrayList<>();
+		// 批内已占用的编码，用于识别文件内重复数据。
+		Map<String, Integer> occupiedCodeMap = new HashMap<>();
+		// 本文件声明的一级数据（港口）编码集合。
+		// 用于区分两种情况：父港口"漏填"与"父行自身校验失败"。
+		// 后者说明父行已被标红、用户只需改那一行，因此不再连带给码头行报错。
+		Set<String> declaredPortCodeSet = new HashSet<>();
+		// 两阶段导入：先落库一级数据（港口），再落库二级数据（码头），消除对 Excel 行序的依赖。
+		Map<String, PortTerminal> batchPortMap = new LinkedHashMap<>();
+		List<Integer> portIndexList = new ArrayList<>();
+		List<Integer> terminalIndexList = new ArrayList<>();
+		splitByCategory(data, portIndexList, terminalIndexList, occupiedCodeMap, declaredPortCodeSet, failureList);
+		importPorts(data, portIndexList, batchPortMap, failureList);
+		importTerminals(data, terminalIndexList, batchPortMap, declaredPortCodeSet, failureList);
+		if (Func.isNotEmpty(failureList)) {
+			// 抛出携带失败明细的异常，触发事务回滚。
+			// 明细为原表全部行（未出错行仅无错误原因），用户可对照原表修正后重新导入。
+			throw new ImportFailureException(data);
 		}
-		return new ArrayList<>(errorMap.values());
+		return failureList;
 	}
 
-	private void importPortTerminalByCategory(List<PortTerminalExcel> data, Map<String, Integer> codeCountMap,
-			Map<Integer, PortTerminalExcel> errorMap, boolean importPort) {
+	/**
+	 * 按类型拆分数据行，并完成与阶段无关的基础校验（类型、编码格式、批内重复）。
+	 *
+	 * @param data              导入数据
+	 * @param portIndexList     港口行下标
+	 * @param terminalIndexList 码头行下标
+	 * @param occupiedCodeMap   编码占用情况，值为首次出现的下标
+	 * @param declaredPortCodeSet 本文件声明的港口编码（含编码格式不合法的行）
+	 * @param failureList       失败明细
+	 */
+	private void splitByCategory(List<PortTerminalExcel> data, List<Integer> portIndexList, List<Integer> terminalIndexList,
+								 Map<String, Integer> occupiedCodeMap, Set<String> declaredPortCodeSet,
+								 List<PortTerminalExcel> failureList) {
 		for (int index = 0; index < data.size(); index++) {
 			PortTerminalExcel excel = data.get(index);
-			boolean isPort = CATEGORY_PORT.equals(trimToEmpty(excel.getCategory()));
-			if (isPort != importPort) {
+			String category = trimToEmpty(excel.getCategory());
+			boolean categoryValid = CATEGORY_PORT.equals(category) || CATEGORY_TERMINAL.equals(category);
+			if (!categoryValid) {
+				failureList.add(buildFailure(data, index, "类型只能为港口或码头"));
 				continue;
 			}
-			PortTerminal portTerminal = buildImportPortTerminal(excel);
+			// 码头行的「港口编码」既是编号前缀，也是"所属港口"的来源（见 importTerminals）。
+			// 缺失时下游解析不到父港口，而该异常又会被"父行已声明"的抑制逻辑吞掉，
+			// 导致码头被静默丢弃、接口却返回成功——所以必须在这里明确拦下。
+			if (CATEGORY_TERMINAL.equals(category) && Func.isEmpty(trimToEmpty(excel.getPortCode()))) {
+				failureList.add(buildFailure(data, index, "码头必须填写所属港口编码"));
+				continue;
+			}
+			// 只要类型是港口就登记为"本文件已声明"，即使它的编码格式不合法：
+			// 这样引用它的码头行不会被连带报错，用户只需修正这一个港口行。
+			if (CATEGORY_PORT.equals(category)) {
+				String declaredCode = resolveImportCode(excel);
+				if (Func.isNotEmpty(declaredCode)) {
+					declaredPortCodeSet.add(declaredCode);
+				}
+			}
+			String code = resolveImportCode(excel);
+			boolean codeValid = CATEGORY_PORT.equals(category)
+				? PORT_CODE_PATTERN.matcher(code).matches()
+				: TERMINAL_CODE_PATTERN.matcher(code).matches();
+			if (!codeValid) {
+				String message = CATEGORY_PORT.equals(category) ? "港口编码为5位大写字母" : "码头编码格式为港口编码-码头标识";
+				failureList.add(buildFailure(data, index, message));
+				continue;
+			}
+			// 批内重复：两行都需要标记，由用户决定保留哪一行。
+			if (occupiedCodeMap.containsKey(code)) {
+				markFailure(data, occupiedCodeMap.get(code), "编码 " + code + " 在文件中重复出现");
+				failureList.add(buildFailure(data, index, "编码 " + code + " 在文件中重复出现"));
+				continue;
+			}
+			occupiedCodeMap.put(code, index);
+			if (CATEGORY_PORT.equals(category)) {
+				portIndexList.add(index);
+			} else {
+				terminalIndexList.add(index);
+			}
+		}
+	}
+
+	/**
+	 * 阶段一：导入港口（一级数据），同时登记到批次内存映射，供码头引用。
+	 */
+	private void importPorts(List<PortTerminalExcel> data, List<Integer> portIndexList, Map<String, PortTerminal> batchPortMap,
+							 List<PortTerminalExcel> failureList) {
+		for (Integer index : portIndexList) {
+			PortTerminalExcel excel = data.get(index);
+			try {
+				PortTerminal portTerminal = Objects.requireNonNull(BeanUtil.copyProperties(excel, PortTerminal.class));
+				// 导入模板按"港口编码/码头编码"两列填写，需归并为实体编码。
+				portTerminal.setCode(resolveImportCode(excel));
 				portTerminal.setDataSource(SOURCE_BATCH);
 				portTerminal.setStatus(STATUS_ENABLED);
-			normalizeImportPortTerminal(portTerminal);
-			List<String> validationErrors = validateImportPortTerminal(excel, portTerminal, codeCountMap);
-			if (Func.isNotEmpty(validationErrors)) {
-				excel.setErrorMessage(formatImportErrorMessage(validationErrors));
-				errorMap.put(index, excel);
-				continue;
-			}
-			try {
 				prepare(portTerminal, SOURCE_BATCH);
 				validate(portTerminal);
-				prepareImportTarget(portTerminal);
-				if (!saveOrUpdate(portTerminal)) {
-					throw new ServiceException("港口码头保存失败");
+				save(portTerminal);
+				batchPortMap.put(portTerminal.getCode(), portTerminal);
+			} catch (Exception exception) {
+				failureList.add(buildFailure(data, index, resolveMessage(exception)));
+			}
+		}
+	}
+
+	/**
+	 * 阶段二：导入码头（二级数据），上级港口优先取本批次新增的港口，其次回查数据库。
+	 *
+	 * @param declaredPortCodeSet 本文件声明的港口编码，用于避免连带误报
+	 */
+	private void importTerminals(List<PortTerminalExcel> data, List<Integer> terminalIndexList, Map<String, PortTerminal> batchPortMap,
+								 Set<String> declaredPortCodeSet, List<PortTerminalExcel> failureList) {
+		for (Integer index : terminalIndexList) {
+			PortTerminalExcel excel = data.get(index);
+			try {
+				PortTerminal portTerminal = Objects.requireNonNull(BeanUtil.copyProperties(excel, PortTerminal.class));
+				// 导入模板按"港口编码/码头编码"两列填写，需归并为实体编码；上级港口取本行的港口编码列。
+				portTerminal.setCode(resolveImportCode(excel));
+				portTerminal.setParentCode(trimToEmpty(excel.getPortCode()).toUpperCase(Locale.ROOT));
+				portTerminal.setDataSource(SOURCE_BATCH);
+				portTerminal.setStatus(STATUS_ENABLED);
+				prepareTerminal(portTerminal, batchPortMap);
+				validate(portTerminal);
+				save(portTerminal);
+			} catch (ParentPortNotFoundException exception) {
+				// 上级港口就声明在本文件里，只是那一行自己校验失败（已被标红）。
+				// 此时码头行本身没有问题，不再连带报错，避免用户看到"两行都错"的假象。
+				// 注意这里必须与上面 setParentCode 取同一列（港口编码）；
+				// 若改用「上级港口编码」，父港口取不到时会被误判为"已声明"而吞掉异常。
+				if (!declaredPortCodeSet.contains(trimToEmpty(excel.getPortCode()).toUpperCase(Locale.ROOT))) {
+					failureList.add(buildFailure(data, index, resolveMessage(exception)));
 				}
 			} catch (Exception exception) {
-				String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
-				excel.setErrorMessage(formatImportErrorMessage(List.of(message)));
-				errorMap.put(index, excel);
+				failureList.add(buildFailure(data, index, resolveMessage(exception)));
 			}
 		}
 	}
 
-	private void prepareImportTarget(PortTerminal portTerminal) {
-		if (Func.isNotEmpty(portTerminal.getId())) {
+	/**
+	 * 码头导入：上级港口优先匹配本批次新增的港口，其次由 prepare 回查数据库。
+	 */
+	private void prepareTerminal(PortTerminal portTerminal, Map<String, PortTerminal> batchPortMap) {
+		String parentCode = trimToEmpty(portTerminal.getParentCode()).toUpperCase(Locale.ROOT);
+		PortTerminal parent = Func.isEmpty(parentCode) ? null : batchPortMap.get(parentCode);
+		if (Func.isNotEmpty(parent)) {
+			applyParent(portTerminal, parent);
+			// 父信息已由本批次港口回填，无需再回查数据库。
+			prepare(portTerminal, SOURCE_BATCH, true);
 			return;
 		}
-		PortTerminal existingPortTerminal = baseMapper.selectByCodeIncludingDeleted(portTerminal.getCode());
-		if (existingPortTerminal == null) {
-			return;
-		}
-		if (!Objects.equals(existingPortTerminal.getIsDeleted(), 1)) {
-			throw new ServiceException("该编码已存在");
-		}
-		baseMapper.restoreById(existingPortTerminal.getId());
-		portTerminal.setId(existingPortTerminal.getId());
-		portTerminal.setIsDeleted(0);
+		portTerminal.setParentCode(parentCode);
+		prepare(portTerminal, SOURCE_BATCH);
 	}
 
-	private String formatImportErrorMessage(List<String> validationErrors) {
-		StringBuilder errorMessage = new StringBuilder();
-		for (int index = 0; index < validationErrors.size(); index++) {
-			if (index > 0) {
-				errorMessage.append(System.lineSeparator());
+	/**
+	 * 将上级港口信息回填到码头，保证码头不会出现没有港口的数据。
+	 */
+	private void applyParent(PortTerminal portTerminal, PortTerminal parent) {
+		portTerminal.setParentId(parent.getId());
+		portTerminal.setParentCode(parent.getCode());
+		portTerminal.setParentName(parent.getName());
+		// 与回查数据库保持一致：父港口区域信息为空时保留码头自身填写的值。
+		if (Func.isNotEmpty(parent.getCountry())) {
+			portTerminal.setCountry(parent.getCountry());
 		}
-			errorMessage.append(index + 1).append(". ").append(validationErrors.get(index));
+		if (Func.isNotEmpty(parent.getCity())) {
+			portTerminal.setCity(parent.getCity());
 		}
-		return errorMessage.toString();
+		if (Func.isNotEmpty(parent.getDistrictCode())) {
+			portTerminal.setDistrictCode(parent.getDistrictCode());
+			portTerminal.setRegionCode(parent.getDistrictCode());
+		} else if (Func.isNotEmpty(portTerminal.getDistrictCode())) {
+			portTerminal.setRegionCode(portTerminal.getDistrictCode());
 		}
-
-	private Map<String, Integer> buildImportCodeCountMap(List<PortTerminalExcel> data) {
-		Map<String, Integer> codeCountMap = new HashMap<>();
-		for (PortTerminalExcel excel : data) {
-			String code = resolveImportCode(excel);
-			if (Func.isNotEmpty(code)) {
-				codeCountMap.merge(code, 1, Integer::sum);
-			}
-		}
-		return codeCountMap;
-	}
-
-	private PortTerminal buildImportPortTerminal(PortTerminalExcel excel) {
-		PortTerminal portTerminal = new PortTerminal();
-		portTerminal.setCode(resolveImportCode(excel));
-		portTerminal.setName(excel.getName());
-		portTerminal.setCategory(excel.getCategory());
-		portTerminal.setParentName(excel.getParentName());
-		portTerminal.setParentCode(CATEGORY_TERMINAL.equals(trimToEmpty(excel.getCategory())) ? excel.getPortCode() : excel.getParentCode());
-		portTerminal.setCountry(excel.getCountry());
-		portTerminal.setProvinceName(excel.getProvinceName());
-		portTerminal.setCity(excel.getCity());
-		portTerminal.setDistrictName(excel.getDistrictName());
-		portTerminal.setDetailAddress(excel.getDetailAddress());
-		portTerminal.setLongitude(excel.getLongitude());
-		portTerminal.setLatitude(excel.getLatitude());
-		portTerminal.setRemark(excel.getRemark());
-		return portTerminal;
-	}
-
-	private String resolveImportCode(PortTerminalExcel excel) {
-		String portCode = trimToEmpty(excel.getPortCode()).toUpperCase(Locale.ROOT);
-		String terminalCode = trimToEmpty(excel.getTerminalCode()).toUpperCase(Locale.ROOT);
-		if (Func.isEmpty(terminalCode)) {
-			return portCode;
-		}
-		return Func.isEmpty(portCode) ? terminalCode : portCode + "-" + terminalCode;
-	}
-
-	private void normalizeImportPortTerminal(PortTerminal portTerminal) {
-		portTerminal.setCode(trimToEmpty(portTerminal.getCode()).toUpperCase(Locale.ROOT));
-		portTerminal.setCategory(trimToEmpty(portTerminal.getCategory()));
-		portTerminal.setName(trimToEmpty(portTerminal.getName()));
-		portTerminal.setParentCode(trimToNull(portTerminal.getParentCode()));
-		if (Func.isNotEmpty(portTerminal.getParentCode())) {
-			portTerminal.setParentCode(portTerminal.getParentCode().toUpperCase(Locale.ROOT));
-		}
-		portTerminal.setParentName(trimToNull(portTerminal.getParentName()));
-		portTerminal.setCountry(trimToEmpty(portTerminal.getCountry()));
-		portTerminal.setProvinceCode(trimToNull(portTerminal.getProvinceCode()));
-		portTerminal.setProvinceName(trimToNull(portTerminal.getProvinceName()));
-		portTerminal.setCity(trimToEmpty(portTerminal.getCity()));
-		portTerminal.setDistrictCode(trimToNull(portTerminal.getDistrictCode()));
-		portTerminal.setDistrictName(trimToNull(portTerminal.getDistrictName()));
-		portTerminal.setRegionCode(trimToNull(portTerminal.getRegionCode()));
-		if (Func.isEmpty(portTerminal.getDistrictCode()) && Func.isNotEmpty(portTerminal.getRegionCode())) {
-			portTerminal.setDistrictCode(portTerminal.getRegionCode());
-		}
-		portTerminal.setDetailAddress(trimToNull(portTerminal.getDetailAddress()));
-		portTerminal.setRemark(trimToNull(portTerminal.getRemark()));
-	}
-
-	private List<String> validateImportPortTerminal(PortTerminalExcel excel, PortTerminal portTerminal,
-			Map<String, Integer> codeCountMap) {
-		List<String> validationErrors = new ArrayList<>();
-		if (!CATEGORY_PORT.equals(portTerminal.getCategory()) && !CATEGORY_TERMINAL.equals(portTerminal.getCategory())) {
-			addValidationError(validationErrors, "类型只能为港口或码头");
-		}
-		validateImportCodeColumns(excel, portTerminal, validationErrors);
-		if (Func.isEmpty(portTerminal.getCode())) {
-			addValidationError(validationErrors, "编码不能为空");
-		} else {
-			validateImportLength(portTerminal.getCode(), CODE_MAX_LENGTH, "编码不能超过30字", validationErrors);
-			if (CATEGORY_PORT.equals(portTerminal.getCategory()) && !PORT_CODE_PATTERN.matcher(portTerminal.getCode()).matches()) {
-				addValidationError(validationErrors, "港口编码为5位大写字母");
-			}
-			if (CATEGORY_TERMINAL.equals(portTerminal.getCategory()) && !TERMINAL_CODE_PATTERN.matcher(portTerminal.getCode()).matches()) {
-				addValidationError(validationErrors, "码头编码格式为港口编码-码头标识");
-			}
-			if (codeCountMap.getOrDefault(portTerminal.getCode(), 0) > 1) {
-				addValidationError(validationErrors, "编码在本次导入中重复");
-			}
-			if (count(Wrappers.<PortTerminal>lambdaQuery()
-				.eq(PortTerminal::getCode, portTerminal.getCode())
-				.eq(PortTerminal::getIsDeleted, 0)) > 0L) {
-				addValidationError(validationErrors, "该编码已存在");
-			}
-		}
-		if (Func.isEmpty(portTerminal.getName())) {
-			addValidationError(validationErrors, "港口/码头名称不能为空");
-		}
-		validateImportLength(portTerminal.getName(), NAME_MAX_LENGTH, "港口/码头名称不能超过100字", validationErrors);
-		validateImportLength(portTerminal.getCountry(), REGION_MAX_LENGTH, "国家不能超过50字", validationErrors);
-		validateImportLength(portTerminal.getProvinceName(), REGION_MAX_LENGTH, "所属省份不能超过50字", validationErrors);
-		validateImportLength(portTerminal.getCity(), REGION_MAX_LENGTH, "城市不能超过50字", validationErrors);
-		validateImportLength(portTerminal.getDistrictName(), REGION_MAX_LENGTH, "区县不能超过50字", validationErrors);
-		validateImportLength(portTerminal.getRegionCode(), REGION_CODE_MAX_LENGTH, "行政区划编码不能超过32字", validationErrors);
-		if (Func.isEmpty(portTerminal.getDetailAddress())) {
-			addValidationError(validationErrors, "详细地址不能为空");
-		}
-		validateImportLength(portTerminal.getDetailAddress(), DETAIL_ADDRESS_MAX_LENGTH, "详细地址不能超过255字", validationErrors);
-		validateImportLength(portTerminal.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200个字", validationErrors);
-		if (Func.isEmpty(portTerminal.getLongitude())) {
-			addValidationError(validationErrors, "经度不能为空");
-		} else if (!validRange(portTerminal.getLongitude(), MIN_LONGITUDE, MAX_LONGITUDE)) {
-			addValidationError(validationErrors, "经度范围为 -180 到 180");
-		}
-		if (Func.isEmpty(portTerminal.getLatitude())) {
-			addValidationError(validationErrors, "纬度不能为空");
-		} else if (!validRange(portTerminal.getLatitude(), MIN_LATITUDE, MAX_LATITUDE)) {
-			addValidationError(validationErrors, "纬度范围为 -90 到 90");
-		}
-		if (CATEGORY_PORT.equals(portTerminal.getCategory())) {
-			validateImportPortRegion(portTerminal, validationErrors);
-		}
-		if (CATEGORY_TERMINAL.equals(portTerminal.getCategory())) {
-			validateImportParentPort(portTerminal, validationErrors);
-		}
-		return validationErrors;
-	}
-
-	private void validateImportCodeColumns(PortTerminalExcel excel, PortTerminal portTerminal,
-			List<String> validationErrors) {
-		String portCode = trimToEmpty(excel.getPortCode()).toUpperCase(Locale.ROOT);
-		String terminalCode = trimToEmpty(excel.getTerminalCode()).toUpperCase(Locale.ROOT);
-		String parentCode = trimToEmpty(excel.getParentCode()).toUpperCase(Locale.ROOT);
-		if (Func.isEmpty(portCode)) {
-			addValidationError(validationErrors, "港口编码不能为空");
-		}
-		if (!CATEGORY_TERMINAL.equals(portTerminal.getCategory())) {
-			return;
-		}
-		if (Func.isEmpty(terminalCode)) {
-			addValidationError(validationErrors, "码头编码不能为空");
-		}
-		if (Func.isEmpty(portTerminal.getParentName())) {
-			addValidationError(validationErrors, "上级港口不能为空");
-		}
-		if (Func.isEmpty(parentCode)) {
-			addValidationError(validationErrors, "上级港口编码不能为空");
-		} else if (Func.isNotEmpty(portCode) && !portCode.equals(parentCode) && !portCode.endsWith(parentCode)) {
-			addValidationError(validationErrors, "港口编码与上级港口编码不匹配");
+		if (Func.isNotEmpty(parent.getDistrictName())) {
+			portTerminal.setDistrictName(parent.getDistrictName());
 		}
 	}
 
-	private void validateImportPortRegion(PortTerminal portTerminal, List<String> validationErrors) {
-		if (Func.isEmpty(portTerminal.getCountry())) {
-			addValidationError(validationErrors, "国家不能为空");
+	/**
+	 * 构造失败明细，行号按 Excel 中的实际行号（表头占第 1 行）推算。
+	 */
+	private PortTerminalExcel buildFailure(List<PortTerminalExcel> data, int index, String message) {
+		PortTerminalExcel excel = data.get(index);
+		markFailure(data, index, message);
+		return excel;
 	}
-		if (Func.isEmpty(portTerminal.getCity())) {
-			addValidationError(validationErrors, "城市不能为空");
-		}
-		if (Func.isEmpty(portTerminal.getProvinceName())) {
-			addValidationError(validationErrors, "所属省份不能为空");
-		}
-		if (Func.isEmpty(portTerminal.getDistrictCode()) && Func.isEmpty(portTerminal.getDistrictName())) {
-			addValidationError(validationErrors, "区县不能为空");
-			return;
-		}
-		try {
-			fillRegion(portTerminal);
-		} catch (ServiceException exception) {
-			addValidationError(validationErrors, exception.getMessage());
+
+	/**
+	 * 仅标注错误原因，不重复加入失败明细集合。
+	 */
+	private void markFailure(List<PortTerminalExcel> data, int index, String message) {
+		if (index >= 0 && index < data.size()) {
+			data.get(index).setErrorMessage("第" + (index + 2) + "行：" + message);
 		}
 	}
 
-	private void validateImportParentPort(PortTerminal portTerminal, List<String> validationErrors) {
-		if (Func.isEmpty(portTerminal.getParentCode())) {
-			addValidationError(validationErrors, "上级港口编码不能为空");
-			return;
-		}
-		PortTerminal parentPort = getOne(Wrappers.<PortTerminal>lambdaQuery()
-			.eq(PortTerminal::getCode, portTerminal.getParentCode())
-			.eq(PortTerminal::getCategory, CATEGORY_PORT)
-			.eq(PortTerminal::getIsDeleted, 0), false);
-		if (Func.isEmpty(parentPort)) {
-			addValidationError(validationErrors, "上级港口编码对应的港口不存在");
-		} else if (Func.isNotEmpty(portTerminal.getParentName()) && !Objects.equals(portTerminal.getParentName(), parentPort.getName())) {
-			addValidationError(validationErrors, "上级港口与上级港口编码不匹配");
-		}
-		if (Func.isNotEmpty(portTerminal.getCode()) && !portTerminal.getCode().startsWith(portTerminal.getParentCode() + "-")) {
-			addValidationError(validationErrors, "码头编码必须以上级港口编码开头");
-		}
-	}
-
-	private void validateImportLength(String value, int maxLength, String message, List<String> validationErrors) {
-		if (Func.isNotEmpty(value) && value.length() > maxLength) {
-			addValidationError(validationErrors, message);
-		}
-	}
-
-	private void addValidationError(List<String> validationErrors, String message) {
-		if (Func.isNotEmpty(message) && !validationErrors.contains(message)) {
-			validationErrors.add(message);
-		}
+	/**
+	 * 解析异常信息，非业务异常统一提示导入失败。
+	 */
+	private String resolveMessage(Exception exception) {
+		return exception instanceof ServiceException ? exception.getMessage() : "导入失败";
 	}
 
 	@Override
@@ -430,12 +370,21 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 	}
 
 	private void prepare(PortTerminal portTerminal, String defaultDataSource) {
+		prepare(portTerminal, defaultDataSource, false);
+	}
+
+	/**
+	 * 整理并补全港口码头数据。
+	 *
+	 * @param portTerminal      港口码头
+	 * @param defaultDataSource 默认数据来源
+	 * @param parentResolved    上级港口是否已确定（批量导入时由批次内存匹配得到，无需回查数据库）
+	 */
+	private void prepare(PortTerminal portTerminal, String defaultDataSource, boolean parentResolved) {
 		portTerminal.setCode(trimToEmpty(portTerminal.getCode()).toUpperCase(Locale.ROOT));
 		portTerminal.setCategory(trimToEmpty(portTerminal.getCategory()));
 		portTerminal.setName(trimToEmpty(portTerminal.getName()));
 		portTerminal.setCountry(trimToEmpty(portTerminal.getCountry()));
-		portTerminal.setProvinceCode(trimToNull(portTerminal.getProvinceCode()));
-		portTerminal.setProvinceName(trimToNull(portTerminal.getProvinceName()));
 		portTerminal.setCity(trimToEmpty(portTerminal.getCity()));
 		portTerminal.setDistrictCode(trimToNull(portTerminal.getDistrictCode()));
 		portTerminal.setDistrictName(trimToNull(portTerminal.getDistrictName()));
@@ -456,6 +405,9 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 			portTerminal.setParentName(null);
 			return;
 		}
+		if (parentResolved) {
+			return;
+		}
 		fillParentPort(portTerminal);
 	}
 
@@ -471,7 +423,9 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 				.eq(PortTerminal::getIsDeleted, 0));
 		}
 		if (Func.isEmpty(parent)) {
-			throw new ServiceException("码头必须选择上级港口");
+			// 用专用异常类型：调用方需要区分"父港口真的漏填"与"父行自身失败"，
+			// 后者不应连带给码头行报错（见 importTerminals）。
+			throw new ParentPortNotFoundException("码头必须选择上级港口");
 		}
 		if (!CATEGORY_PORT.equals(parent.getCategory())) {
 			throw new ServiceException("上级港口类型不正确");
@@ -479,31 +433,25 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 		portTerminal.setParentId(parent.getId());
 		portTerminal.setParentCode(parent.getCode());
 		portTerminal.setParentName(parent.getName());
-		portTerminal.setCountry(inheritParentValue(parent.getCountry(), portTerminal.getCountry()));
-		portTerminal.setProvinceCode(inheritParentValue(parent.getProvinceCode(), portTerminal.getProvinceCode()));
-		portTerminal.setProvinceName(inheritParentValue(parent.getProvinceName(), portTerminal.getProvinceName()));
-		portTerminal.setCity(inheritParentValue(parent.getCity(), portTerminal.getCity()));
-		portTerminal.setDistrictCode(inheritParentValue(parent.getDistrictCode(), portTerminal.getDistrictCode()));
-		portTerminal.setDistrictName(inheritParentValue(parent.getDistrictName(), portTerminal.getDistrictName()));
-		portTerminal.setRegionCode(inheritParentValue(parent.getDistrictCode(), portTerminal.getRegionCode()));
-		if (Func.isEmpty(portTerminal.getDistrictCode()) && Func.isNotEmpty(portTerminal.getDistrictName())) {
-			fillRegion(portTerminal);
+		// 父港口区域信息为空时保留码头自身填写的值，避免历史数据（区县为空）导致码头无法导入。
+		if (Func.isNotEmpty(parent.getCountry())) {
+			portTerminal.setCountry(parent.getCountry());
+		}
+		if (Func.isNotEmpty(parent.getCity())) {
+			portTerminal.setCity(parent.getCity());
+		}
+		if (Func.isNotEmpty(parent.getDistrictCode())) {
+			portTerminal.setDistrictCode(parent.getDistrictCode());
+			portTerminal.setRegionCode(parent.getDistrictCode());
+		} else if (Func.isNotEmpty(portTerminal.getRegionCode())) {
+			portTerminal.setDistrictCode(portTerminal.getRegionCode());
+		}
+		if (Func.isNotEmpty(parent.getDistrictName())) {
+			portTerminal.setDistrictName(parent.getDistrictName());
 		}
 	}
 
 	private void fillRegion(PortTerminal portTerminal) {
-		Region selectedProvince = null;
-		if (Func.isNotEmpty(portTerminal.getProvinceCode())) {
-			selectedProvince = regionService.getById(portTerminal.getProvinceCode());
-		}
-		if (Func.isEmpty(selectedProvince) && Func.isNotEmpty(portTerminal.getProvinceName())) {
-			selectedProvince = regionService.getOne(Wrappers.<Region>lambdaQuery()
-				.eq(Region::getName, portTerminal.getProvinceName())
-				.eq(Region::getRegionLevel, 1), false);
-		}
-		if (Func.isEmpty(selectedProvince)) {
-			throw new ServiceException("请选择所属省份");
-		}
 		Region district = null;
 		if (Func.isNotEmpty(portTerminal.getDistrictCode())) {
 			district = regionService.getById(portTerminal.getDistrictCode());
@@ -512,7 +460,6 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 			if (Func.isNotEmpty(portTerminal.getCity())) {
 				List<Region> cityList = regionService.list(Wrappers.<Region>lambdaQuery()
 					.eq(Region::getName, portTerminal.getCity())
-					.eq(Region::getParentCode, selectedProvince.getCode())
 					.eq(Region::getRegionLevel, 2));
 				for (Region city : cityList) {
 					district = regionService.getOne(Wrappers.<Region>lambdaQuery()
@@ -536,26 +483,9 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 		if (Func.isEmpty(city)) {
 			throw new ServiceException("区县所属城市不存在");
 		}
-		Region province = regionService.getById(city.getParentCode());
-		if (Func.isEmpty(province)) {
-			throw new ServiceException("城市所属省份不存在");
-		}
-		if (Func.isNotEmpty(portTerminal.getProvinceCode())
-			&& !Objects.equals(portTerminal.getProvinceCode(), province.getCode())) {
-			throw new ServiceException("城市与省份不匹配");
-		}
-		if (Func.isNotEmpty(portTerminal.getProvinceName())
-			&& !Objects.equals(portTerminal.getProvinceName(), province.getName())) {
-			throw new ServiceException("城市与省份不匹配");
-		}
-		if (!Objects.equals(selectedProvince.getCode(), province.getCode())) {
-			throw new ServiceException("城市与省份不匹配");
-		}
 		if (Func.isNotEmpty(portTerminal.getCity()) && !Objects.equals(portTerminal.getCity(), city.getName())) {
 			throw new ServiceException("区县与城市不匹配");
 		}
-		portTerminal.setProvinceCode(province.getCode());
-		portTerminal.setProvinceName(province.getName());
 		portTerminal.setCity(city.getName());
 		portTerminal.setDistrictCode(district.getCode());
 		portTerminal.setDistrictName(district.getName());
@@ -575,7 +505,6 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 		validateLength(portTerminal.getCode(), CODE_MAX_LENGTH, "编码不能超过30字");
 		validateLength(portTerminal.getName(), NAME_MAX_LENGTH, "港口/码头名称不能超过100字");
 		validateLength(portTerminal.getCountry(), REGION_MAX_LENGTH, "国家不能超过50字");
-		validateLength(portTerminal.getProvinceName(), REGION_MAX_LENGTH, "所属省份不能超过50字");
 		validateLength(portTerminal.getCity(), REGION_MAX_LENGTH, "城市不能超过50字");
 		validateLength(portTerminal.getDistrictName(), REGION_MAX_LENGTH, "区县不能超过50字");
 		validateLength(portTerminal.getRegionCode(), REGION_CODE_MAX_LENGTH, "行政区划编码不能超过32字");
@@ -596,15 +525,9 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 		if (Func.isEmpty(portTerminal.getCity())) {
 			throw new ServiceException("城市不能为空");
 		}
-		if (Func.isEmpty(portTerminal.getProvinceCode())) {
-			throw new ServiceException("请选择所属省份");
-		}
 		if (Func.isEmpty(portTerminal.getDistrictCode())) {
 			throw new ServiceException("区县不能为空");
 		}
-		if (Func.isEmpty(portTerminal.getDetailAddress())) {
-			throw new ServiceException("详细地址不能为空");
-		}
 		validateDataSource(portTerminal.getDataSource());
 		validateStatus(portTerminal.getStatus());
 		validateRange(portTerminal.getLongitude(), MIN_LONGITUDE, MAX_LONGITUDE, "经度范围为 -180 到 180");
@@ -655,12 +578,21 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 		return Func.isEmpty(value) || (value.compareTo(min) >= 0 && value.compareTo(max) <= 0);
 	}
 
+	/**
+	 * 归并导入行编码：仅填港口编码时取港口编码，填了码头编码时拼接为"港口编码-码头编码"。
+	 */
+	private String resolveImportCode(PortTerminalExcel excel) {
+		String portCode = trimToEmpty(excel.getPortCode()).toUpperCase(Locale.ROOT);
+		String terminalCode = trimToEmpty(excel.getTerminalCode()).toUpperCase(Locale.ROOT);
+		if (Func.isEmpty(terminalCode)) {
+			return portCode;
+		}
+		return Func.isEmpty(portCode) ? terminalCode : portCode + "-" + terminalCode;
+	}
+
 	private String normalizeDataSource(String dataSource) {
 		String value = trimToEmpty(dataSource);
-		if (SOURCE_INITIAL_IMPORT.equals(value) || SOURCE_INITIAL_OLD.equals(value)) {
-			return SOURCE_INITIAL;
-		}
-		return SOURCE_MANUAL_OLD.equals(value) ? SOURCE_MANUAL : value;
+		return SOURCE_INITIAL_OLD.equals(value) ? SOURCE_INITIAL : value;
 	}
 
 	private void validateEnabledTerminal(Long parentId) {
@@ -686,9 +618,23 @@ public class PortTerminalServiceImpl extends BaseServiceImpl<PortTerminalMapper,
 		return trimValue.isEmpty() ? null : trimValue;
 	}
 
-	private String inheritParentValue(String parentValue, String currentValue) {
-		String normalizedParentValue = trimToNull(parentValue);
-		return normalizedParentValue == null ? currentValue : normalizedParentValue;
+	/**
+	 * 上级港口找不到时抛出。
+	 * <p>
+	 * 与普通业务异常区分开，是因为调用方需要判断：这个父港口到底是"用户漏填了"，
+	 * 还是"父港口那一行就在本文件里、只是它自己校验失败"。后者不该连带给码头行报错。
+	 *
+	 * @author Chill
+	 */
+	private static class ParentPortNotFoundException extends ServiceException {
+
+		@Serial
+		private static final long serialVersionUID = 1L;
+
+		ParentPortNotFoundException(String message) {
+			super(message);
+		}
+
 	}
 
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java

@@ -39,6 +39,7 @@ import org.springblade.common.constant.DataStatusEnum;
 import org.bouncycastle.util.encoders.Hex;
 import org.springblade.common.constant.ParamConstant;
 import org.springblade.common.constant.TenantConstant;
+import org.springblade.common.utils.PasswordRuleUtil;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -76,7 +77,6 @@ import org.springblade.system.wrapper.UserWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.security.SecureRandom;
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -106,9 +106,6 @@ import static org.springblade.core.tenant.TenantGuard.EntityType.USER;
 @Slf4j
 public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implements IUserService {
 	private static final String GUEST_NAME = "guest";
-	private static final String PASSWORD_CHARS = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789";
-	private static final int RANDOM_PASSWORD_LENGTH = 8;
-	private static final SecureRandom SECURE_RANDOM = new SecureRandom();
 	private static final String IAM_DEFAULT_DICT_CODE = "iam_default";
 	private static final String IAM_DEFAULT_ROLE_NAME = "默认角色";
 	private static final String IAM_DEFAULT_DEPT_NAME = "默认部门";
@@ -588,7 +585,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		List<User> userList = TenantGuard.verifyBatch(this, idList, USER);
 		Map<String, String> passwordMap = new LinkedHashMap<>();
 		for (User user : userList) {
-			String password = randomPassword();
+			String password = PasswordRuleUtil.generate();
 			User updateUser = new User();
 			updateUser.setPassword(DigestUtil.encrypt(password));
 			updateUser.setUpdateTime(DateUtil.now());
@@ -604,6 +601,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		if (!Objects.equals(password, password2)) {
 			throw new ServiceException("两次输入密码不一致!");
 		}
+		validatePlainPassword(password);
 		User user = TenantGuard.verify(this, userId, USER);
 		User updateUser = new User();
 		updateUser.setPassword(DigestUtil.encrypt(password));
@@ -672,7 +670,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 			if (user.getId() != null) {
 				this.updateUser(user);
 			} else {
-				user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+				// 空密码交由 saveUser 按规则填充（初始密码不合规时自动生成）
+				user.setPassword(null);
 				this.submit(user);
 			}
 		});
@@ -689,6 +688,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	 */
 	private User buildImportUser(UserExcel userExcel, String tenantId) {
 		User user = Objects.requireNonNull(BeanUtil.copyProperties(userExcel, User.class));
+		// 宽容解析生日文本（2026-8-2 等写法），User.birthday 为 java.util.Date 需转换
+		java.time.LocalDate birthday = org.springblade.common.excel.LenientDateParser.parseDate(userExcel.getBirthday(), "生日");
+		user.setBirthday(birthday == null ? null : java.sql.Date.valueOf(birthday));
 		user.setTenantId(tenantId);
 		user.setUserType(Func.toInt(DictCache.getKey(DictEnum.USER_TYPE, userExcel.getUserTypeName()), 1));
 		user.setDeptId(Func.toStrWithEmpty(SysCache.getDeptIds(tenantId, userExcel.getDeptName()), StringPool.EMPTY));
@@ -1061,8 +1063,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 			}
 		}
 		if (Func.isEmpty(user.getPassword())) {
-			user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+			String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+			user.setPassword(PasswordRuleUtil.isValid(initPassword) ? initPassword : PasswordRuleUtil.generate());
 		}
+		validatePlainPassword(user.getPassword());
 		user.setPassword(DigestUtil.encrypt(user.getPassword()));
 		Long userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount()));
 		if (userCount > 0L && Func.isEmpty(user.getId())) {
@@ -1144,12 +1148,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 //		}
 	}
 
-	private String randomPassword() {
-		StringBuilder password = new StringBuilder(RANDOM_PASSWORD_LENGTH);
-		for (int index = 0; index < RANDOM_PASSWORD_LENGTH; index++) {
-			password.append(PASSWORD_CHARS.charAt(SECURE_RANDOM.nextInt(PASSWORD_CHARS.length())));
+	private void validatePlainPassword(String password) {
+		if (!PasswordRuleUtil.isValid(password)) {
+			throw new ServiceException(PasswordRuleUtil.RULE_MESSAGE);
 		}
-		return password.toString();
 	}
 
 }

blade-service/blade-system/src/main/resources/application.yml

@@ -32,3 +32,12 @@ iam:
     authorization: ${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}
     profile-authorization: ${IAM_SSO_PROFILE_AUTHORIZATION:YjNlZmU0ODEwMzJiNGJhZTpkYzQ5NDY1NmQ4MzE0NThjODI5MzlmNzA2ZjliNDY3MQ==}
     page-size: ${IAM_SSO_ACCOUNT_PAGE_SIZE:50}
+
+# OA组织/人员同步走同一 gwzh 网关，仅需 Authorization（与可用 curl 一致）
+thirdParty:
+  oa:
+    baseUrl: ${OA_BASE_URL:http://172.16.204.83:38000}
+    queryCompanyPageUrl: ${OA_QUERY_COMPANY_PAGE_URL:/gwzh/OA/OA_GET_COMPANY_LIST}
+    queryDepartmentPageUrl: ${OA_QUERY_DEPARTMENT_PAGE_URL:/gwzh/OA/OA_GET_DEPARTMENT_LIST}
+    queryPersonPageUrl: ${OA_QUERY_PERSON_PAGE_URL:/gwzh/OA/OA_GET_USER_LIST}
+    authorization: ${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}}

blade-service/blade-transport/pom.xml

@@ -31,6 +31,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-transport-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-lbs-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
@@ -39,6 +43,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-process-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>

blade-service/blade-transport/src/main/java/org/springblade/transport/config/VoucherMinioConfig.java

@@ -6,14 +6,20 @@ package org.springblade.transport.config;
 
 import io.minio.MinioClient;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * 凭证图片 MinIO 客户端配置。
+ * <p>
  * 连接参数由 Nacos 的 file.storage.minio 配置提供。
+ * 未配置 {@code file.storage.minio.endpoint} 时不注册该客户端，
+ * 以免凭证上传功能缺失配置导致整个 blade-transport 服务无法启动；
+ * 此时凭证相关接口会在调用时给出明确提示，而非启动即失败。
  */
 @Configuration
+@ConditionalOnProperty(prefix = "file.storage.minio", name = "endpoint")
 public class VoucherMinioConfig {
 
 	@Bean

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchivePublicController.java

@@ -0,0 +1,102 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.controller;
+
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.secure.constant.AuthConstant;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.core.tool.api.R;
+import org.springblade.transport.pojo.vo.CustomerArchiveVO;
+import org.springblade.transport.pojo.vo.CustomerChangeRecordVO;
+import org.springblade.transport.service.ICustomerArchiveService;
+import org.springblade.transport.service.impl.CustomerArchivePublicProcessService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 客商档案公开查看 控制器
+ *
+ * @author Chill
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@TenantIgnore
+@PreAuth(AuthConstant.PERMIT_ALL)
+@RequestMapping("/customer-archive/public")
+@Tag(name = "客商档案公开查看", description = "客商档案公开查看")
+public class CustomerArchivePublicController {
+
+	private final ICustomerArchiveService customerArchiveService;
+	private final CustomerArchivePublicProcessService customerArchivePublicProcessService;
+
+	/**
+	 * 公开详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "公开详情", description = "传入id，无需登录")
+	public R<CustomerArchiveVO> detail(@Parameter(description = "主键", required = true) @RequestParam Long id) {
+		return R.data(customerArchiveService.publicDetail(id));
+	}
+
+	/**
+	 * 公开变更记录分页
+	 */
+	@GetMapping("/change-record/list")
+	@ApiOperationSupport(order = 2)
+	@Operation(summary = "公开变更记录分页", description = "传入客商ID，无需登录")
+	public R<IPage<CustomerChangeRecordVO>> changeRecordList(
+		@Parameter(description = "客商ID", required = true) @RequestParam Long customerId, Query query) {
+		return R.data(customerArchiveService.publicChangeRecordPage(Condition.getPage(query), customerId));
+	}
+
+	/**
+	 * 公开接收流程页 postMessage 数据
+	 */
+	@PostMapping("/process-message")
+	@ApiOperationSupport(order = 3)
+	@Operation(summary = "公开接收流程消息", description = "无需登录，立即查询当前节点，5秒后查询流程实例详情并同步客商")
+	public R processMessage(@RequestBody Map<String, Object> body) {
+		log.info("客商公开页收到流程消息：{}", JSON.toJSONString(body));
+		customerArchivePublicProcessService.handleProcessMessage(body);
+		return R.success("ok");
+	}
+
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/MkProcessPublicController.java

@@ -0,0 +1,55 @@
+package org.springblade.transport.controller;
+
+import com.alibaba.fastjson2.JSON;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.secure.constant.AuthConstant;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.core.tool.api.R;
+import org.springblade.transport.mk.MkProcessMessageService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * MK 业务流程公开查看
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@TenantIgnore
+@PreAuth(AuthConstant.PERMIT_ALL)
+@RequestMapping("/mk-process/public")
+@Tag(name = "MK业务流程公开查看", description = "MK业务流程公开查看")
+public class MkProcessPublicController {
+
+	private final MkProcessMessageService mkProcessMessageService;
+
+	@GetMapping("/{bizType}/detail")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "公开详情", description = "无需登录")
+	public R detail(@PathVariable String bizType,
+		@Parameter(description = "主键", required = true) @RequestParam Long id) {
+		return R.data(mkProcessMessageService.handler(bizType).publicDetail(id));
+	}
+
+	@PostMapping("/{bizType}/process-message")
+	@ApiOperationSupport(order = 2)
+	@Operation(summary = "公开接收流程消息", description = "无需登录，立即查询当前节点，5秒后查询流程实例详情并同步业务")
+	public R processMessage(@PathVariable String bizType, @RequestBody Map<String, Object> body) {
+		log.info("公开页收到流程消息 bizType={} body={}", bizType, JSON.toJSONString(body));
+		mkProcessMessageService.handleProcessMessage(bizType, body);
+		return R.success("ok");
+	}
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProcessConfigController.java

@@ -52,6 +52,7 @@ import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.pojo.vo.BusinessRemoveResultVO;
 import org.springblade.transport.pojo.vo.ProcessConfigVO;
 import org.springblade.transport.service.IProcessConfigService;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -83,20 +84,34 @@ public class ProcessConfigController extends BladeController {
 	private final VoucherFileMapper voucherFileMapper;
 	private final VoucherImageMapper voucherImageMapper;
 	private final VoucherManageMapper voucherManageMapper;
-	private final MinioClient minioClient;
+	private final ObjectProvider<MinioClient> minioClientProvider;
 	@Value("${file.storage.minio.bucket-name:${minio.bucket-name:}}")
 	private String minioBucketName;
 
 	public ProcessConfigController(IProcessConfigService processConfigService, WaybillMapper waybillMapper,
 		VoucherFileMapper voucherFileMapper, VoucherImageMapper voucherImageMapper,
 		VoucherManageMapper voucherManageMapper,
-		MinioClient minioClient) {
+		ObjectProvider<MinioClient> minioClientProvider) {
 		this.processConfigService = processConfigService;
 		this.waybillMapper = waybillMapper;
 		this.voucherFileMapper = voucherFileMapper;
 		this.voucherImageMapper = voucherImageMapper;
 		this.voucherManageMapper = voucherManageMapper;
-		this.minioClient = minioClient;
+		this.minioClientProvider = minioClientProvider;
+	}
+
+	/**
+	 * 获取 MinIO 客户端。
+	 * <p>
+	 * 未配置 file.storage.minio.endpoint 时该客户端不会被注册，
+	 * 此时凭证预览地址无法生成，抛出明确提示而非启动即失败。
+	 */
+	private MinioClient minioClient() {
+		MinioClient minioClient = minioClientProvider.getIfAvailable();
+		if (minioClient == null) {
+			throw new IllegalStateException("Nacos 未配置 file.storage.minio.endpoint，凭证文件功能不可用");
+		}
+		return minioClient;
 	}
 
 	@GetMapping("/detail")
@@ -147,7 +162,7 @@ public class ProcessConfigController extends BladeController {
 				result.put("waybillNo", image.getWaybillNo());
 				result.put("objectKey", image.getObjectKey());
 				try {
-					result.put("url", minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
+					result.put("url", minioClient().getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
 						.method(Method.GET).bucket(minioBucketName).object(image.getObjectKey())
 						.expiry(1, TimeUnit.HOURS).build()));
 				} catch (Exception e) {
@@ -270,7 +285,7 @@ public class ProcessConfigController extends BladeController {
 		result.put("objectKey", image.objectKey());
 		result.put("matched", image.matched());
 		try {
-			result.put("url", minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
+			result.put("url", minioClient().getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
 				.method(Method.GET).bucket(minioBucketName).object(image.objectKey())
 				.expiry(1, TimeUnit.HOURS).build()));
 		} catch (Exception exception) {

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProjectApplyController.java

@@ -105,7 +105,7 @@ public class ProjectApplyController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增或修改", description = "传入projectApply")
 	public R submit(@RequestBody ProjectApply projectApply) {
-		return R.status(projectApplyService.submit(projectApply));
+		return projectApplyService.submit(projectApply) ? R.data(projectApply) : R.fail("保存失败");
 	}
 
 	@PostMapping("/submit-approval")

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/WaybillController.java

@@ -53,6 +53,8 @@ import org.springblade.transport.pojo.dto.WaybillImportBatchRequest;
 import org.springblade.transport.pojo.vo.BusinessRemoveResultVO;
 import org.springblade.transport.pojo.vo.LoadingManageVO;
 import org.springblade.transport.pojo.vo.WaybillImportBatchVO;
+import org.springblade.transport.pojo.vo.WaybillLocateVO;
+import org.springblade.transport.pojo.vo.WaybillTrackVO;
 import org.springblade.transport.pojo.vo.WaybillPunchRecordsVO;
 import org.springblade.transport.pojo.vo.WaybillVO;
 import org.springblade.transport.pojo.dto.WaybillMileageRequest;
@@ -109,6 +111,23 @@ public class WaybillController extends BladeController {
 		return R.data(waybillService.listPunchRecords(waybillId));
 	}
 
+	@PostMapping("/locate")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "车辆实时定位", description = "按运单绑定车牌调用 LBS_LOCATE")
+	public R<WaybillLocateVO> locate(@Parameter(description = "运单ID", required = true) @RequestParam Long id) {
+		return R.data(waybillService.locateVehicle(id));
+	}
+
+	@PostMapping("/track")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "车辆历史轨迹", description = "按运单绑定车牌 + 日期区间调用 LBS_TRACK")
+	public R<WaybillTrackVO> track(
+		@Parameter(description = "运单ID", required = true) @RequestParam Long id,
+		@Parameter(description = "开始日期 YYYY-MM-DD", required = true) @RequestParam String startDate,
+		@Parameter(description = "结束日期 YYYY-MM-DD", required = true) @RequestParam String endDate) {
+		return R.data(waybillService.trackVehicle(id, startDate, endDate));
+	}
+
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@Operation(summary = "分页", description = "传入waybill")
@@ -194,7 +213,7 @@ public class WaybillController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@Operation(summary = "新增或修改", description = "传入waybill")
 	public R submit(@RequestBody Waybill waybill) {
-		return R.status(waybillService.submit(waybill));
+		return waybillService.submit(waybill) ? R.data(waybill) : R.fail("保存失败");
 	}
 
 	@PostMapping("/save-draft")

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExcel.java

@@ -36,7 +36,6 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 /**
  * 事故记录 Excel
@@ -60,8 +59,8 @@ public class AccidentRecordExcel implements Serializable {
 	@ExcelProperty("*车牌号/船号")
 	private String vehicleNo;
 
-	@ExcelProperty("*事故发生日期")
-	private LocalDate accidentDate;
+	@ExcelProperty(value = "*事故发生日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String accidentDate;
 
 	@ExcelProperty("事故发生地点")
 	private String accidentLocation;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AccidentRecordExportExcel.java

@@ -37,7 +37,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 事故记录导出 Excel
@@ -83,14 +83,14 @@ public class AccidentRecordExportExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExcel.java

@@ -35,7 +35,6 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 /**
  * 年检记录 Excel
@@ -59,11 +58,11 @@ public class AnnualInspectionRecordExcel implements Serializable {
 	@ExcelProperty("*车牌号/船号")
 	private String vehicleNo;
 
-	@ExcelProperty("*检测评定日期")
-	private LocalDate inspectionAssessmentDate;
+	@ExcelProperty(value = "*检测评定日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String inspectionAssessmentDate;
 
-	@ExcelProperty("*有效期截止日")
-	private LocalDate validUntilDate;
+	@ExcelProperty(value = "*有效期截止日", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String validUntilDate;
 
 	@ExcelProperty("*车辆技术等级")
 	private String vehicleTechnicalLevel;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/AnnualInspectionRecordExportExcel.java

@@ -36,7 +36,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 年检记录导出 Excel
@@ -83,14 +83,14 @@ public class AnnualInspectionRecordExportExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExportExcel.java

@@ -24,6 +24,7 @@ package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelIgnore;
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import cn.idev.excel.annotation.write.style.ContentRowHeight;
 import cn.idev.excel.annotation.write.style.HeadRowHeight;
@@ -88,9 +89,11 @@ public class CommonAddressExportExcel implements Serializable {
 	private String remark;
 
 	@ExcelProperty("更新时间")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 
 	@ExcelProperty("创建时间")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java

@@ -24,6 +24,7 @@
 package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import cn.idev.excel.annotation.format.NumberFormat;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import cn.idev.excel.annotation.write.style.ContentRowHeight;
@@ -93,9 +94,11 @@ public class CommonCargoExportExcel implements Serializable {
 	private String deptName;
 
 	@ExcelProperty("更新时间")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 
 	@ExcelProperty("创建时间")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExportExcel.java

@@ -23,6 +23,7 @@
 package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import cn.idev.excel.annotation.write.style.ContentRowHeight;
 import cn.idev.excel.annotation.write.style.HeadRowHeight;
@@ -75,8 +76,10 @@ public class CommonRouteExportExcel implements Serializable {
 	@ExcelProperty("更新人")
 	private String updateUserName;
 	@ExcelProperty("更新时间")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 	@ExcelProperty("创建时间")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java

@@ -23,6 +23,7 @@
 package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import cn.idev.excel.annotation.format.NumberFormat;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import cn.idev.excel.annotation.write.style.ContentRowHeight;
@@ -33,7 +34,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 合同管理 Excel
@@ -111,8 +112,10 @@ public class ContractManageExcel implements Serializable {
 	@ExcelProperty("更新人")
 	private String updateUserName;
 	@ExcelProperty("创建时间")
-	private LocalDateTime createTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
 	@ExcelProperty("更新时间")
-	private LocalDateTime updateTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EquipmentLedgerExcel.java

@@ -7,12 +7,10 @@ package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelIgnore;
 import cn.idev.excel.annotation.ExcelProperty;
-import cn.idev.excel.annotation.format.DateTimeFormat;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
 
 /**
  * 设备台账 Excel
@@ -29,7 +27,7 @@ public class EquipmentLedgerExcel implements Serializable {
 	@ExcelProperty("设备品牌") private String equipmentBrand;
 	@ExcelProperty("设备类型") private String equipmentType;
 	@ExcelProperty("规格型号") private String specificationModel;
-	@ExcelProperty("出厂日期") @DateTimeFormat("yyyy-MM-dd") private LocalDate factoryDate;
+	@ExcelProperty(value = "出厂日期", converter = org.springblade.common.excel.LenientDateStringConverter.class) private String factoryDate;
 	@ExcelProperty("备注") private String remark;
 	@ExcelIgnore private String errorMessage;
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/EtcRecordExportExcel.java

@@ -11,6 +11,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * ETC记录导出 Excel
@@ -50,14 +51,14 @@ public class EtcRecordExportExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExcel.java

@@ -35,7 +35,6 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 /**
  * 保险记录 Excel
@@ -68,11 +67,11 @@ public class InsuranceRecordExcel implements Serializable {
 	@ExcelProperty("*保单号")
 	private String policyNo;
 
-	@ExcelProperty("*开始日期")
-	private LocalDate startDate;
+	@ExcelProperty(value = "*开始日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String startDate;
 
-	@ExcelProperty("*结束日期")
-	private LocalDate endDate;
+	@ExcelProperty(value = "*结束日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String endDate;
 
 	@ExcelProperty("保额")
 	private BigDecimal insuredAmount;
@@ -83,8 +82,8 @@ public class InsuranceRecordExcel implements Serializable {
 	@ExcelProperty("发票号")
 	private String invoiceNo;
 
-	@ExcelProperty("开票日期")
-	private LocalDate invoiceDate;
+	@ExcelProperty(value = "开票日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String invoiceDate;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/InsuranceRecordExportExcel.java

@@ -36,7 +36,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 保险记录导出 Excel
@@ -83,14 +83,14 @@ public class InsuranceRecordExportExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanDateTimeConverter.java

@@ -33,22 +33,20 @@ import cn.idev.excel.metadata.data.WriteCellData;
 import cn.idev.excel.metadata.property.ExcelContentProperty;
 import cn.idev.excel.util.DateUtils;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
 
 /**
  * 保养记录日期转换器，兼容日期文本、日期时间文本和 Excel 数值日期。
+ * <p>
+ * 文本解析委托公共宽容解析器（支持 2026-8-2、2026/8/2 等写法，口径见根工作区
+ * docs/import-spec.md）；无法识别的文本按既有行为抛出转换异常，
+ * 文案带原值，与「日期格式无法识别」口径一致。
  *
  * @author Chill
  */
 public class MaintenancePlanDateTimeConverter implements Converter<LocalDateTime> {
 
 	private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
-	private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-	private static final DateTimeFormatter DATE_TIME_MINUTE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-	private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT);
 
 	@Override
 	public Class<?> supportJavaTypeKey() {
@@ -71,16 +69,14 @@ public class MaintenancePlanDateTimeConverter implements Converter<LocalDateTime
 		if (value == null || value.trim().isEmpty()) {
 			return null;
 		}
-		String normalizedValue = value.trim();
-		try {
-			return LocalDateTime.parse(normalizedValue, DATE_TIME_FORMATTER);
-		} catch (DateTimeParseException ignored) {
-			try {
-				return LocalDateTime.parse(normalizedValue, DATE_TIME_MINUTE_FORMATTER);
-			} catch (DateTimeParseException ignoredMinute) {
-				return LocalDate.parse(normalizedValue, DATE_FORMATTER).atStartOfDay();
-			}
+		LocalDateTime parsed = org.springblade.common.excel.LenientDateParser.parseDateTimeOrNull(value);
+		if (parsed != null) {
+			return parsed;
 		}
+		// 无法识别的文本：与既有行为一致抛出转换异常（ExcelDataConvertException 是 RuntimeException，
+		// 会带上本文案一路抛到 Controller，由全局异常处理返回给前端提示）。
+		throw new cn.idev.excel.exception.ExcelDataConvertException(-1, -1, cellData, contentProperty,
+			value.trim() + " 日期格式无法识别");
 	}
 
 	@Override

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExportExcel.java

@@ -11,7 +11,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 车辆保养记录导出 Excel
@@ -26,12 +26,12 @@ public class MaintenancePlanExportExcel extends MaintenancePlanExcel {
 
 	@ExcelProperty(value = "创建时间", index = 12)
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty(value = "更新人", index = 13)
 	private String updateUserName;
 
 	@ExcelProperty(value = "更新时间", index = 14)
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java

@@ -38,6 +38,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 车辆维修记录 Excel
@@ -95,16 +96,16 @@ public class MaintenanceRecordExcel implements Serializable {
 	@NumberFormat("0.00")
 	private BigDecimal mileage;
 
-	@ExcelProperty(value = "创建时间", converter = MaintenancePlanDateTimeConverter.class)
+	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
-	@ExcelProperty(value = "更新时间", converter = MaintenancePlanDateTimeConverter.class)
+	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("里程单位")
 	private String mileageUnit;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExportExcel.java

@@ -25,7 +25,6 @@
  */
 package org.springblade.transport.excel;
 
-import cn.idev.excel.annotation.ExcelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -42,7 +41,4 @@ public class MaintenanceRecordExportExcel extends MaintenanceRecordExcel {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	@ExcelProperty(value = "导出失败原因", index = 17)
-	private String errorMessage;
-
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MileageRecordExportExcel.java

@@ -36,7 +36,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 里程记录导出 Excel
@@ -72,14 +72,14 @@ public class MileageRecordExportExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OilElectricRecordExportExcel.java

@@ -11,6 +11,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 油电记录导出 Excel
@@ -61,14 +62,14 @@ public class OilElectricRecordExportExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExcel.java

@@ -16,7 +16,6 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 /**
  * 其他费用记录 Excel
@@ -40,8 +39,8 @@ public class OtherExpenseRecordExcel implements Serializable {
 	@ExcelProperty("*车牌号/船号")
 	private String vehicleNo;
 
-	@ExcelProperty("*费用日期")
-	private LocalDate expenseDate;
+	@ExcelProperty(value = "*费用日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String expenseDate;
 
 	@ExcelProperty("*费用类型")
 	private String expenseType;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/OtherExpenseRecordExportExcel.java

@@ -11,7 +11,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 其他费用记录导出 Excel
@@ -43,14 +43,14 @@ public class OtherExpenseRecordExportExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExportExcel.java

@@ -23,6 +23,7 @@
 package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import cn.idev.excel.annotation.write.style.ContentRowHeight;
 import cn.idev.excel.annotation.write.style.HeadRowHeight;
@@ -69,8 +70,10 @@ public class ProcessConfigExportExcel implements Serializable {
 	@ExcelProperty("更新人")
 	private String updateUserName;
 	@ExcelProperty("更新时间")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 	@ExcelProperty("创建时间")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProjectApplyExcel.java

@@ -23,6 +23,7 @@
 package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import cn.idev.excel.annotation.write.style.ContentRowHeight;
 import cn.idev.excel.annotation.write.style.HeadRowHeight;
@@ -33,6 +34,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 项目立项 Excel
@@ -123,8 +125,10 @@ public class ProjectApplyExcel implements Serializable {
 	@ExcelProperty("更新人")
 	private String updateUserName;
 	@ExcelProperty("创建时间")
-	private LocalDateTime createTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
 	@ExcelProperty("更新时间")
-	private LocalDateTime updateTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ShippingTemplateExcel.java

@@ -23,6 +23,7 @@
 package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import cn.idev.excel.annotation.write.style.ContentRowHeight;
 import cn.idev.excel.annotation.write.style.HeadRowHeight;
@@ -30,7 +31,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 发货模板 Excel
@@ -59,8 +60,10 @@ public class ShippingTemplateExcel implements Serializable {
 	@ExcelProperty("备注")
 	private String remark;
 	@ExcelProperty("更新时间")
-	private LocalDateTime updateTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
 	@ExcelProperty("创建时间")
-	private LocalDateTime createTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TemporaryCreditLimitExcel.java

@@ -23,6 +23,7 @@
 package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import cn.idev.excel.annotation.write.style.ContentRowHeight;
 import cn.idev.excel.annotation.write.style.HeadRowHeight;
@@ -32,7 +33,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 临时额度申请 Excel
@@ -81,8 +82,10 @@ public class TemporaryCreditLimitExcel implements Serializable {
 	@ExcelProperty("更新人")
 	private String updateUserName;
 	@ExcelProperty("创建时间")
-	private LocalDateTime createTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
 	@ExcelProperty("更新时间")
-	private LocalDateTime updateTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementDateStringConverter.java

@@ -38,6 +38,10 @@ import java.time.format.DateTimeFormatter;
 
 /**
  * 换胎日期文本转换器，保留非法日期原值并兼容 Excel 数值日期。
+ * <p>
+ * 数值日期序列号转 ISO 文本，文本原样透传；文本的宽容解析由服务层委托
+ * {@link org.springblade.common.excel.LenientDateParser} 完成（支持 2026-8-2 等写法，
+ * 口径见根工作区 docs/import-spec.md）。
  *
  * @author Chill
  */

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TireReplacementRecordExportExcel.java

@@ -37,7 +37,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 换胎记录导出 Excel
@@ -76,14 +76,14 @@ public class TireReplacementRecordExportExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportChangeRecordExportExcel.java

@@ -28,7 +28,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 变更记录导出 Excel
@@ -57,14 +57,14 @@ public class TransportChangeRecordExportExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelProperty("备注")
 	private String remark;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/TransportPlanExcel.java

@@ -23,6 +23,7 @@
 package org.springblade.transport.excel;
 
 import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import cn.idev.excel.annotation.write.style.ContentRowHeight;
 import cn.idev.excel.annotation.write.style.HeadRowHeight;
@@ -31,7 +32,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 运输计划 Excel
@@ -92,8 +93,10 @@ public class TransportPlanExcel implements Serializable {
 	@ExcelProperty("更新人")
 	private String updateUserName;
 	@ExcelProperty("创建时间")
-	private LocalDateTime createTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
 	@ExcelProperty("更新时间")
-	private LocalDateTime updateTime;
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordExcel.java

@@ -37,6 +37,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 违章记录 Excel
@@ -95,14 +96,14 @@ public class ViolationRecordExcel implements Serializable {
 
 	@ExcelProperty("创建时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	@ExcelProperty("更新人")
 	private String updateUserName;
 
 	@ExcelProperty("更新时间")
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
 	@ExcelIgnore
 	private String errorMessage;

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ViolationRecordImportExcel.java

@@ -60,8 +60,11 @@ public class ViolationRecordImportExcel implements Serializable {
 	@ExcelProperty("*驾驶人")
 	private String driverName;
 
-	@ExcelProperty("*类型/事项")
-	private String violationTypeOrItem;
+	@ExcelProperty("*类型")
+	private String violationType;
+
+	@ExcelProperty("*事项")
+	private String violationItem;
 
 	@ExcelProperty(value = "*时间", converter = MaintenancePlanDateTimeConverter.class)
 	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/WaybillExcel.java

@@ -108,10 +108,10 @@ public class WaybillExcel implements Serializable {
 	private String escortPhone;
 	@ExcelProperty("里程(km)")
 	private BigDecimal mileage;
-	@ExcelProperty("预计发货日期")
-	private LocalDate estimatedStartTime;
-	@ExcelProperty("预计完成日期")
-	private LocalDate estimatedEndTime;
+	@ExcelProperty(value = "预计发货日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String estimatedStartTime;
+	@ExcelProperty(value = "预计完成日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String estimatedEndTime;
 	@ExcelProperty("单价")
 	private BigDecimal unitPrice;
 	@ExcelProperty("计价单位")
@@ -126,10 +126,10 @@ public class WaybillExcel implements Serializable {
 	private String businessStatus;
 	@ExcelProperty("数据来源")
 	private String dataSource;
-	@ExcelProperty("开始日期")
-	private LocalDate startDate;
-	@ExcelProperty("结束日期")
-	private LocalDate endDate;
+	@ExcelProperty(value = "开始日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String startDate;
+	@ExcelProperty(value = "结束日期", converter = org.springblade.common.excel.LenientDateStringConverter.class)
+	private String endDate;
 	@ExcelProperty("计划名称")
 	private String planName;
 	@ExcelProperty("多联总单")

blade-service/blade-transport/src/main/java/org/springblade/transport/feign/CustomerArchiveClient.java

@@ -0,0 +1,39 @@
+package org.springblade.transport.feign;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.secure.constant.AuthConstant;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.core.tool.api.FR;
+import org.springblade.transport.pojo.dto.CustomerProcessNodeSyncDTO;
+import org.springblade.transport.service.ICustomerArchiveService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 客商档案 Feign实现
+ */
+@Hidden
+@RestController
+@AllArgsConstructor
+public class CustomerArchiveClient implements ICustomerArchiveClient {
+
+	private final ICustomerArchiveService customerArchiveService;
+
+	@TenantIgnore
+	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PostMapping(SYNC_PROCESS_NODE)
+	@Override
+	public FR<Boolean> syncProcessNode(@RequestBody CustomerProcessNodeSyncDTO param) {
+		if (param == null) {
+			return FR.data(false);
+		}
+		if (param.getProcessInfo() != null) {
+			return FR.data(customerArchiveService.syncProcessNodeFromProcessInfo(param.getId(), param.getProcessInfo()));
+		}
+		return FR.data(customerArchiveService.syncProcessNode(
+			param.getId(), param.getCurrentNode(), param.getCurrentProcessor(), param.getApprovalStatus()));
+	}
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/feign/MkProcessClient.java

@@ -0,0 +1,42 @@
+package org.springblade.transport.feign;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.secure.constant.AuthConstant;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.core.tool.api.FR;
+import org.springblade.transport.mk.IMkProcessBizHandler;
+import org.springblade.transport.mk.MkProcessMessageService;
+import org.springblade.transport.pojo.dto.MkProcessSyncDTO;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * MK 业务流程同步 Feign 实现
+ */
+@Hidden
+@RestController
+@AllArgsConstructor
+public class MkProcessClient implements IMkProcessClient {
+
+	private final MkProcessMessageService mkProcessMessageService;
+
+	@TenantIgnore
+	@PreAuth(AuthConstant.PERMIT_ALL)
+	@PostMapping(APPLY)
+	@Override
+	public FR<Boolean> apply(@RequestBody MkProcessSyncDTO param) {
+		if (param == null || param.getId() == null) {
+			return FR.data(false);
+		}
+		IMkProcessBizHandler handler = mkProcessMessageService.handler(param.getBizType());
+		String action = param.getAction() == null ? "sync" : param.getAction();
+		return switch (action) {
+			case "approve" -> FR.data(handler.approveFromProcess(param.getId(), param.getProcessorName()));
+			case "reject" -> FR.data(handler.rejectFromProcess(param.getId(), param.getProcessorName()));
+			default -> FR.data(handler.syncFromProcessInfo(param.getId(), param.getProcessInfo()));
+		};
+	}
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/ProjectApplyMapper.java

@@ -22,9 +22,15 @@
  */
 package org.springblade.transport.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springblade.transport.pojo.entity.ProjectApply;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 项目立项 Mapper 接口
  *
@@ -32,4 +38,26 @@ import org.springblade.transport.pojo.entity.ProjectApply;
  */
 public interface ProjectApplyMapper extends BaseMapper<ProjectApply> {
 
+	/**
+	 * 按租户读取业务字典项，供未登录公开页回显下拉文案
+	 */
+	@InterceptorIgnore(tenantLine = "true")
+	@Select("""
+		SELECT dict_key AS dictKey, dict_value AS dictValue
+		FROM blade_dict_biz
+		WHERE is_deleted = 0 AND parent_id <> 0 AND tenant_id = #{tenantId} AND code = #{code}
+		""")
+	List<Map<String, Object>> selectDictBizItems(@Param("tenantId") String tenantId, @Param("code") String code);
+
+	/**
+	 * 读取系统字典项，供未登录公开页回显下拉文案
+	 */
+	@InterceptorIgnore(tenantLine = "true")
+	@Select("""
+		SELECT dict_key AS dictKey, dict_value AS dictValue
+		FROM blade_dict
+		WHERE is_deleted = 0 AND parent_id <> 0 AND code = #{code}
+		""")
+	List<Map<String, Object>> selectDictItems(@Param("code") String code);
+
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/mk/IMkProcessBizHandler.java

@@ -0,0 +1,17 @@
+package org.springblade.transport.mk;
+
+/**
+ * MK 业务流程处理器
+ */
+public interface IMkProcessBizHandler {
+
+	String bizType();
+
+	Object publicDetail(Long id);
+
+	boolean syncFromProcessInfo(Long id, Object processInfo);
+
+	boolean approveFromProcess(Long id, String processorName);
+
+	boolean rejectFromProcess(Long id, String processorName);
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessBizHandlers.java

@@ -0,0 +1,439 @@
+package org.springblade.transport.mk;
+
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.transport.pojo.entity.ContractManage;
+import org.springblade.transport.pojo.entity.FormalSettlement;
+import org.springblade.transport.pojo.entity.PaymentApplication;
+import org.springblade.transport.pojo.entity.PreSettlement;
+import org.springblade.transport.pojo.entity.ProjectApply;
+import org.springblade.transport.pojo.entity.Waybill;
+import org.springblade.transport.service.IContractManageService;
+import org.springblade.transport.service.ICustomerArchiveService;
+import org.springblade.transport.service.IFormalSettlementService;
+import org.springblade.transport.service.IPaymentApplicationService;
+import org.springblade.transport.service.IPreSettlementService;
+import org.springblade.transport.service.IProjectApplyService;
+import org.springblade.transport.service.IWaybillService;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * 各业务 MK 流程处理器
+ */
+public final class MkProcessBizHandlers {
+
+	private MkProcessBizHandlers() {
+	}
+
+	@Component
+	@TenantIgnore
+	@RequiredArgsConstructor
+	public static class CustomerHandler implements IMkProcessBizHandler {
+		private final ICustomerArchiveService service;
+
+		@Override
+		public String bizType() {
+			return "customer-archive";
+		}
+
+		@Override
+		public Object publicDetail(Long id) {
+			return service.publicDetail(id);
+		}
+
+		@Override
+		public boolean syncFromProcessInfo(Long id, Object processInfo) {
+			return service.syncProcessNodeFromProcessInfo(id, processInfo);
+		}
+
+		@Override
+		public boolean approveFromProcess(Long id, String processorName) {
+			return service.approveFromProcess(id, processorName);
+		}
+
+		@Override
+		public boolean rejectFromProcess(Long id, String processorName) {
+			return service.rejectFromProcess(id, processorName);
+		}
+	}
+
+	@Component
+	@TenantIgnore
+	@RequiredArgsConstructor
+	public static class ProjectHandler implements IMkProcessBizHandler {
+		private final IProjectApplyService service;
+
+		@Override
+		public String bizType() {
+			return "project-apply";
+		}
+
+		@Override
+		public Object publicDetail(Long id) {
+			return service.publicDetail(id);
+		}
+
+		@Override
+		public boolean syncFromProcessInfo(Long id, Object processInfo) {
+			ProjectApply entity = service.getById(id);
+			if (entity == null) {
+				return false;
+			}
+			String node = MkProcessNodeHelper.currentNode(processInfo);
+			String processor = MkProcessNodeHelper.currentProcessor(processInfo);
+			if (Func.isEmpty(node) && Func.isEmpty(processor)) {
+				return false;
+			}
+			if (Func.isNotEmpty(node)) {
+				entity.setCurrentNode(node);
+			}
+			if (Func.isNotEmpty(processor)) {
+				entity.setCurrentProcessor(processor);
+			}
+			if (!"change_reviewing".equals(entity.getApprovalStatus())) {
+				entity.setApprovalStatus("reviewing");
+			}
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean approveFromProcess(Long id, String processorName) {
+			ProjectApply entity = service.getById(id);
+			if (entity == null || "approved".equals(entity.getApprovalStatus())
+				|| "change_approved".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			boolean change = "change_reviewing".equals(entity.getApprovalStatus());
+			entity.setApprovalStatus(change ? "change_approved" : "approved");
+			entity.setEffectiveType("formal");
+			entity.setCurrentNode("审核通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			entity.setApprovedTime(LocalDateTime.now());
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean rejectFromProcess(Long id, String processorName) {
+			ProjectApply entity = service.getById(id);
+			if (entity == null || "rejected".equals(entity.getApprovalStatus())
+				|| "change_rejected".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			boolean change = "change_reviewing".equals(entity.getApprovalStatus());
+			entity.setApprovalStatus(change ? "change_rejected" : "rejected");
+			entity.setCurrentNode("审核不通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			return service.updateById(entity);
+		}
+	}
+
+	@Component
+	@TenantIgnore
+	@RequiredArgsConstructor
+	public static class ContractHandler implements IMkProcessBizHandler {
+		private final IContractManageService service;
+
+		@Override
+		public String bizType() {
+			return "contract-manage";
+		}
+
+		@Override
+		public Object publicDetail(Long id) {
+			return service.publicDetail(id);
+		}
+
+		@Override
+		public boolean syncFromProcessInfo(Long id, Object processInfo) {
+			ContractManage entity = service.getById(id);
+			if (entity == null) {
+				return false;
+			}
+			String node = MkProcessNodeHelper.currentNode(processInfo);
+			String processor = MkProcessNodeHelper.currentProcessor(processInfo);
+			if (Func.isEmpty(node) && Func.isEmpty(processor)) {
+				return false;
+			}
+			if (Func.isNotEmpty(node)) {
+				entity.setCurrentNode(node);
+			}
+			if (Func.isNotEmpty(processor)) {
+				entity.setCurrentProcessor(processor);
+			}
+			if (!"change_reviewing".equals(entity.getApprovalStatus())) {
+				entity.setApprovalStatus("reviewing");
+			}
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean approveFromProcess(Long id, String processorName) {
+			ContractManage entity = service.getById(id);
+			if (entity == null || "approved".equals(entity.getApprovalStatus())
+				|| "change_approved".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			boolean change = "change_reviewing".equals(entity.getApprovalStatus());
+			entity.setApprovalStatus(change ? "change_approved" : "approved");
+			entity.setCurrentNode("审核通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean rejectFromProcess(Long id, String processorName) {
+			ContractManage entity = service.getById(id);
+			if (entity == null || "rejected".equals(entity.getApprovalStatus())
+				|| "change_rejected".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			boolean change = "change_reviewing".equals(entity.getApprovalStatus());
+			entity.setApprovalStatus(change ? "change_rejected" : "rejected");
+			entity.setCurrentNode("审核不通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			return service.updateById(entity);
+		}
+	}
+
+	@Component
+	@TenantIgnore
+	@RequiredArgsConstructor
+	public static class WaybillHandler implements IMkProcessBizHandler {
+		private final IWaybillService service;
+
+		@Override
+		public String bizType() {
+			return "waybill-manage";
+		}
+
+		@Override
+		public Object publicDetail(Long id) {
+			return service.publicDetail(id);
+		}
+
+		@Override
+		public boolean syncFromProcessInfo(Long id, Object processInfo) {
+			Waybill entity = service.getById(id);
+			if (entity == null) {
+				return false;
+			}
+			String node = MkProcessNodeHelper.currentNode(processInfo);
+			if (Func.isEmpty(node)) {
+				return false;
+			}
+			entity.setCurrentProcessNode(node);
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean approveFromProcess(Long id, String processorName) {
+			Waybill entity = service.getById(id);
+			if (entity == null) {
+				return false;
+			}
+			entity.setCurrentProcessNode("审核通过");
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean rejectFromProcess(Long id, String processorName) {
+			Waybill entity = service.getById(id);
+			if (entity == null) {
+				return false;
+			}
+			entity.setCurrentProcessNode("审核不通过");
+			return service.updateById(entity);
+		}
+	}
+
+	@Component
+	@TenantIgnore
+	@RequiredArgsConstructor
+	public static class PreSettlementHandler implements IMkProcessBizHandler {
+		private final IPreSettlementService service;
+
+		@Override
+		public String bizType() {
+			return "pre-settlement";
+		}
+
+		@Override
+		public Object publicDetail(Long id) {
+			return service.detail(id);
+		}
+
+		@Override
+		public boolean syncFromProcessInfo(Long id, Object processInfo) {
+			PreSettlement entity = service.getById(id);
+			if (entity == null) {
+				return false;
+			}
+			String node = MkProcessNodeHelper.currentNode(processInfo);
+			String processor = MkProcessNodeHelper.currentProcessor(processInfo);
+			if (Func.isEmpty(node) && Func.isEmpty(processor)) {
+				return false;
+			}
+			if (Func.isNotEmpty(node)) {
+				entity.setCurrentNode(node);
+			}
+			if (Func.isNotEmpty(processor)) {
+				entity.setCurrentProcessor(processor);
+			}
+			entity.setApprovalStatus("reviewing");
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean approveFromProcess(Long id, String processorName) {
+			PreSettlement entity = service.getById(id);
+			if (entity == null || "approved".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			entity.setApprovalStatus("approved");
+			entity.setCurrentNode("审核通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			entity.setApprovedTime(LocalDateTime.now());
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean rejectFromProcess(Long id, String processorName) {
+			PreSettlement entity = service.getById(id);
+			if (entity == null || "returned".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			entity.setApprovalStatus("returned");
+			entity.setCurrentNode("审核不通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			return service.updateById(entity);
+		}
+	}
+
+	@Component
+	@TenantIgnore
+	@RequiredArgsConstructor
+	public static class FormalSettlementHandler implements IMkProcessBizHandler {
+		private final IFormalSettlementService service;
+
+		@Override
+		public String bizType() {
+			return "formal-settlement";
+		}
+
+		@Override
+		public Object publicDetail(Long id) {
+			return service.detail(id);
+		}
+
+		@Override
+		public boolean syncFromProcessInfo(Long id, Object processInfo) {
+			FormalSettlement entity = service.getById(id);
+			if (entity == null) {
+				return false;
+			}
+			String node = MkProcessNodeHelper.currentNode(processInfo);
+			String processor = MkProcessNodeHelper.currentProcessor(processInfo);
+			if (Func.isEmpty(node) && Func.isEmpty(processor)) {
+				return false;
+			}
+			if (Func.isNotEmpty(node)) {
+				entity.setCurrentNode(node);
+			}
+			if (Func.isNotEmpty(processor)) {
+				entity.setCurrentProcessor(processor);
+			}
+			entity.setApprovalStatus("reviewing");
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean approveFromProcess(Long id, String processorName) {
+			FormalSettlement entity = service.getById(id);
+			if (entity == null || "approved".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			entity.setApprovalStatus("approved");
+			entity.setCurrentNode("审核通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			entity.setApprovedTime(LocalDateTime.now());
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean rejectFromProcess(Long id, String processorName) {
+			FormalSettlement entity = service.getById(id);
+			if (entity == null || "returned".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			entity.setApprovalStatus("returned");
+			entity.setCurrentNode("审核不通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			return service.updateById(entity);
+		}
+	}
+
+	@Component
+	@TenantIgnore
+	@RequiredArgsConstructor
+	public static class PaymentHandler implements IMkProcessBizHandler {
+		private final IPaymentApplicationService service;
+
+		@Override
+		public String bizType() {
+			return "payment-application";
+		}
+
+		@Override
+		public Object publicDetail(Long id) {
+			return service.detail(id);
+		}
+
+		@Override
+		public boolean syncFromProcessInfo(Long id, Object processInfo) {
+			PaymentApplication entity = service.getById(id);
+			if (entity == null) {
+				return false;
+			}
+			String node = MkProcessNodeHelper.currentNode(processInfo);
+			String processor = MkProcessNodeHelper.currentProcessor(processInfo);
+			if (Func.isEmpty(node) && Func.isEmpty(processor)) {
+				return false;
+			}
+			if (Func.isNotEmpty(node)) {
+				entity.setCurrentNode(node);
+			}
+			if (Func.isNotEmpty(processor)) {
+				entity.setCurrentProcessor(processor);
+			}
+			entity.setApprovalStatus("reviewing");
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean approveFromProcess(Long id, String processorName) {
+			PaymentApplication entity = service.getById(id);
+			if (entity == null || "approved".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			entity.setApprovalStatus("approved");
+			entity.setCurrentNode("审核通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			return service.updateById(entity);
+		}
+
+		@Override
+		public boolean rejectFromProcess(Long id, String processorName) {
+			PaymentApplication entity = service.getById(id);
+			if (entity == null || "returned".equals(entity.getApprovalStatus())) {
+				return entity != null;
+			}
+			entity.setApprovalStatus("returned");
+			entity.setCurrentNode("审核不通过");
+			entity.setCurrentProcessor(MkProcessNodeHelper.text(processorName, "系统"));
+			return service.updateById(entity);
+		}
+	}
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessMessageService.java

@@ -0,0 +1,191 @@
+package org.springblade.transport.mk;
+
+import com.alibaba.fastjson2.JSON;
+import jakarta.annotation.PreDestroy;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.core.tool.api.FR;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.process.feign.IBusinessProcessClient;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 公开页流程消息：当前节点立即查询，流程实例详情延迟 5 秒查询后同步业务状态。
+ */
+@Slf4j
+@Service
+@TenantIgnore
+@RequiredArgsConstructor
+public class MkProcessMessageService {
+
+	private static final long PROCESS_INFO_DELAY_SECONDS = 5L;
+
+	private final IBusinessProcessClient businessProcessClient;
+	private final List<IMkProcessBizHandler> handlers;
+	private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(2, runnable -> {
+		Thread thread = new Thread(runnable, "mk-process-info-" + THREAD_INDEX.incrementAndGet());
+		thread.setDaemon(true);
+		return thread;
+	});
+
+	private static final AtomicInteger THREAD_INDEX = new AtomicInteger();
+
+	@PreDestroy
+	public void shutdown() {
+		scheduler.shutdown();
+	}
+
+	public IMkProcessBizHandler handler(String bizType) {
+		Map<String, IMkProcessBizHandler> mapping = handlers.stream()
+			.collect(Collectors.toMap(IMkProcessBizHandler::bizType, Function.identity(), (a, b) -> a));
+		IMkProcessBizHandler handler = mapping.get(bizType);
+		if (handler == null) {
+			throw new IllegalArgumentException("不支持的MK业务类型：" + bizType);
+		}
+		return handler;
+	}
+
+	public void handleProcessMessage(String bizType, Map<String, Object> body) {
+		IMkProcessBizHandler handler = handler(bizType);
+		Map<String, Object> formValues = asMap(body == null ? null : body.get("formValues"));
+		String processId = firstText(formValues, "processId");
+		if (StringUtil.isBlank(processId) && body != null) {
+			processId = firstText(body, "processId");
+		}
+		String loginName = firstText(formValues, "mkLoginName", "loginName");
+		if (StringUtil.isBlank(processId)) {
+			log.warn("公开页流程消息未找到 processId，跳过查询当前节点 bizType={}", bizType);
+			return;
+		}
+		String bizIdText = firstText(asMap(body == null ? null : body.get("formData")), "id", "formInstanceId");
+		queryCurrentNodes(bizType, processId, loginName);
+		scheduleProcessInfo(handler, bizType, processId, loginName, bizIdText, formValues);
+	}
+
+	private void queryCurrentNodes(String bizType, String processId, String loginName) {
+		try {
+			FR<Object> result = businessProcessClient.getCurrentNodes(processId, loginName);
+			Object nodeData = result == null ? null : result.getData();
+			log.info("公开页流程消息当前节点详情 bizType={} processId={} loginName={} result={}",
+				bizType, processId, loginName, JSON.toJSONString(nodeData));
+		} catch (Exception e) {
+			log.error("公开页查询当前节点失败 bizType={} processId={} loginName={}", bizType, processId, loginName, e);
+		}
+	}
+
+	private void scheduleProcessInfo(IMkProcessBizHandler handler, String bizType, String processId,
+			String loginName, String bizIdText, Map<String, Object> formValues) {
+		Map<String, Object> formValuesCopy = new HashMap<>(formValues == null ? Map.of() : formValues);
+		log.info("公开页将在{}秒后查询流程实例详情 bizType={} processId={}", PROCESS_INFO_DELAY_SECONDS, bizType, processId);
+		scheduler.schedule(
+			() -> queryProcessInfo(handler, bizType, processId, loginName, bizIdText, formValuesCopy),
+			PROCESS_INFO_DELAY_SECONDS,
+			TimeUnit.SECONDS
+		);
+	}
+
+	private void queryProcessInfo(IMkProcessBizHandler handler, String bizType, String processId,
+			String loginName, String bizIdText, Map<String, Object> formValues) {
+		try {
+			FR<Object> processInfoResult = businessProcessClient.getProcessInfo(processId, loginName);
+			Object processInfo = processInfoResult == null ? null : processInfoResult.getData();
+			log.info("公开页流程消息流程实例详情 bizType={} processId={} loginName={} result={}",
+				bizType, processId, loginName, JSON.toJSONString(processInfo));
+			if (isProcessFinished(processInfo)) {
+				applyProcessResult(handler, bizType, bizIdText, processId, formValues, true);
+			} else if (isProcessRejected(processInfo)) {
+				applyProcessResult(handler, bizType, bizIdText, processId, formValues, false);
+			} else if (StringUtil.isNotBlank(bizIdText)) {
+				try {
+					handler.syncFromProcessInfo(Long.valueOf(bizIdText), processInfo);
+				} catch (NumberFormatException e) {
+					log.warn("公开页流程消息业务id格式不正确 bizType={} id={}", bizType, bizIdText);
+				}
+			}
+		} catch (Exception e) {
+			log.error("公开页查询流程实例详情失败 bizType={} processId={} loginName={}", bizType, processId, loginName, e);
+		}
+	}
+
+	private static boolean isProcessFinished(Object processInfo) {
+		return "30".equals(firstText(asMap(processInfo), "fdProcessStatus"));
+	}
+
+	private static boolean isProcessRejected(Object processInfo) {
+		Map<String, Object> info = asMap(processInfo);
+		if (!"20".equals(firstText(info, "fdProcessStatus"))) {
+			return false;
+		}
+		if (hasItems(info.get("currentHandlers"))) {
+			return false;
+		}
+		return !hasItems(asMap(info.get("fdTaskInfo")).get("handlerInfos"));
+	}
+
+	private static boolean hasItems(Object value) {
+		return value instanceof Collection<?> collection && !collection.isEmpty();
+	}
+
+	private void applyProcessResult(IMkProcessBizHandler handler, String bizType, String bizIdText,
+			String processId, Map<String, Object> formValues, boolean approved) {
+		String action = approved ? "审核通过" : "审核驳回";
+		if (StringUtil.isBlank(bizIdText)) {
+			log.warn("流程{}但未找到业务id，跳过同步 bizType={} processId={}", action, bizType, processId);
+			return;
+		}
+		try {
+			String processorName = firstText(formValues, "mkUserName", "mkLoginName");
+			Long bizId = Long.valueOf(bizIdText);
+			if (approved) {
+				handler.approveFromProcess(bizId, processorName);
+			} else {
+				handler.rejectFromProcess(bizId, processorName);
+			}
+		} catch (NumberFormatException e) {
+			log.warn("流程{}但业务id格式不正确 bizType={} id={}", action, bizType, bizIdText);
+		}
+	}
+
+	private static Map<String, Object> asMap(Object value) {
+		if (!(value instanceof Map<?, ?> map)) {
+			return Collections.emptyMap();
+		}
+		Map<String, Object> result = new HashMap<>();
+		map.forEach((key, nested) -> {
+			if (key != null) {
+				result.put(String.valueOf(key), nested);
+			}
+		});
+		return result;
+	}
+
+	private static String firstText(Map<String, Object> source, String... keys) {
+		if (source == null || keys == null) {
+			return null;
+		}
+		for (String key : keys) {
+			Object value = source.get(key);
+			if (value == null) {
+				continue;
+			}
+			String text = String.valueOf(value).trim();
+			if (StringUtil.isNotBlank(text) && !"null".equalsIgnoreCase(text)) {
+				return text;
+			}
+		}
+		return null;
+	}
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessNodeHelper.java

@@ -0,0 +1,76 @@
+package org.springblade.transport.mk;
+
+import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.core.tool.utils.Func;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 解析 MK 流程实例详情中的当前节点、当前处理人
+ */
+public final class MkProcessNodeHelper {
+
+	private MkProcessNodeHelper() {
+	}
+
+	public static String currentProcessor(Object processInfo) {
+		return joinDistinct(extractTexts(asMap(processInfo).get("currentHandlers"), "fdName", "name"), "、");
+	}
+
+	public static String currentNode(Object processInfo) {
+		Map<String, Object> taskInfo = asMap(asMap(processInfo).get("fdTaskInfo"));
+		return joinDistinct(extractTexts(taskInfo.get("handlerInfos"), "nodeName"), "、");
+	}
+
+	public static String text(String value, String fallback) {
+		return Func.isEmpty(value) ? fallback : value.trim();
+	}
+
+	public static Map<String, Object> asMap(Object value) {
+		if (value instanceof Map<?, ?> map) {
+			Map<String, Object> result = new LinkedHashMap<>();
+			map.forEach((key, nested) -> {
+				if (key != null) {
+					result.put(String.valueOf(key), nested);
+				}
+			});
+			return result;
+		}
+		if (value == null) {
+			return Map.of();
+		}
+		try {
+			Map<String, Object> parsed = JsonUtil.toMap(JsonUtil.toJson(value));
+			return parsed == null ? Map.of() : parsed;
+		} catch (Exception ignored) {
+			return Map.of();
+		}
+	}
+
+	private static List<String> extractTexts(Object listObj, String... keys) {
+		List<String> result = new ArrayList<>();
+		if (!(listObj instanceof Collection<?> collection) || keys == null) {
+			return result;
+		}
+		for (Object item : collection) {
+			Map<String, Object> map = asMap(item);
+			for (String key : keys) {
+				String text = Func.toStr(map.get(key), "").trim();
+				if (Func.isNotEmpty(text)) {
+					result.add(text);
+					break;
+				}
+			}
+		}
+		return result;
+	}
+
+	private static String joinDistinct(List<String> values, String delimiter) {
+		return values.stream().filter(Func::isNotEmpty).distinct().collect(Collectors.joining(delimiter));
+	}
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractManageService.java

@@ -40,6 +40,14 @@ public interface IContractManageService extends BaseService<ContractManage> {
 
 	IPage<ContractManageVO> selectContractManagePage(IPage<ContractManage> page, ContractManageVO contractManage);
 	ContractManageVO detail(Long id);
+
+	/**
+	 * 公开详情，不校验当前用户所属组织
+	 *
+	 * @param id 主键
+	 * @return 合同详情
+	 */
+	ContractManageVO publicDetail(Long id);
 	boolean saveDraft(ContractManage contractManage);
 	boolean submit(ContractManage contractManage);
 	boolean toTemporary(Long id);

blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICustomerArchiveService.java

@@ -66,6 +66,23 @@ public interface ICustomerArchiveService extends BaseService<CustomerArchive> {
 	 */
 	CustomerArchiveVO detail(Long id);
 
+	/**
+	 * 公开查看详情（不校验登录态与数据权限）
+	 *
+	 * @param id 主键
+	 * @return 客商档案详情
+	 */
+	CustomerArchiveVO publicDetail(Long id);
+
+	/**
+	 * 公开查看变更记录分页（不校验登录态与数据权限）
+	 *
+	 * @param page 分页参数
+	 * @param customerId 客商ID
+	 * @return 变更记录分页
+	 */
+	IPage<CustomerChangeRecordVO> publicChangeRecordPage(IPage<CustomerChangeRecordVO> page, Long customerId);
+
 	/**
 	 * 新增或修改客商档案
 	 * <p>仅当 {@code customer.recordChange = true}（前端点「提交」）时写入变更记录；「保存」不落变更记录。</p>
@@ -83,6 +100,53 @@ public interface ICustomerArchiveService extends BaseService<CustomerArchive> {
 	 */
 	boolean submitApproval(Long id);
 
+	/**
+	 * 按 MK 当前节点同步客商当前节点、当前处理人和审批状态
+	 *
+	 * @param id 客商ID
+	 * @param currentNode 当前节点
+	 * @param currentProcessor 当前处理人
+	 * @param approvalStatus 审批状态，可为空，为空时保持为审核中
+	 * @return 是否成功
+	 */
+	boolean syncProcessNode(Long id, String currentNode, String currentProcessor, String approvalStatus);
+
+	/**
+	 * 按 MK getCurrentNodes 返回结果同步客商当前节点
+	 *
+	 * @param id 客商ID
+	 * @param currentNodes MK 当前节点详情
+	 * @return 是否成功
+	 */
+	boolean syncProcessNodeFromMk(Long id, Object currentNodes);
+
+	/**
+	 * 按 MK 流程实例详情回写当前节点、当前处理人
+	 *
+	 * @param id 客商ID
+	 * @param processInfo MK getProcessInfo 返回数据
+	 * @return 是否成功
+	 */
+	boolean syncProcessNodeFromProcessInfo(Long id, Object processInfo);
+
+	/**
+	 * MK 流程结束（fdProcessStatus=30）时将客商置为审核通过
+	 *
+	 * @param id 客商ID
+	 * @param processorName 当前处理人，可为空
+	 * @return 是否成功
+	 */
+	boolean approveFromProcess(Long id, String processorName);
+
+	/**
+	 * MK 流程状态为 20 时将客商置为审核驳回
+	 *
+	 * @param id 客商ID
+	 * @param processorName 当前处理人，可为空
+	 * @return 是否成功
+	 */
+	boolean rejectFromProcess(Long id, String processorName);
+
 	/**
 	 * 撤回审批并恢复草稿状态
 	 *

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProjectApplyService.java

@@ -40,6 +40,14 @@ public interface IProjectApplyService extends BaseService<ProjectApply> {
 
 	IPage<ProjectApplyVO> selectProjectApplyPage(IPage<ProjectApply> page, ProjectApplyVO projectApply);
 	ProjectApplyVO detail(Long id);
+
+	/**
+	 * 公开详情，不校验当前用户所属组织
+	 *
+	 * @param id 主键
+	 * @return 项目立项详情
+	 */
+	ProjectApplyVO publicDetail(Long id);
 	Map<String, Integer> fundRiskStats(ProjectApplyVO projectApply);
 	Map<String, Object> changeRecordDetail(Long id, Integer recordIndex);
 	boolean saveDraft(ProjectApply projectApply);