From 834d64779f950cab6b28bc38e2d49cf04b1dd9d1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 10 Apr 2026 09:00:46 +0800
Subject: [PATCH] opt:机构同步优化

---
 drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java
index 5c37503..36af256 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java
@@ -92,7 +92,7 @@
 		if (deptService.submit(deptEntity)) {
 			CacheUtil.clear(SYS_CACHE);
 			CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
-			List<User> userList = userService.list(new LambdaQueryWrapper<User>().eq(User::getDeptId, dept.getId()));
+			List<User> userList = userService.list(new LambdaQueryWrapper<User>().eq(User::getDeptId, String.valueOf(dept.getId())));
 			if (!userList.isEmpty()) {
 				List<Long> userIds = userList.stream().map(User::getId).collect(Collectors.toList());
 				userService.updateUserAreaCode(dept.getAreaCode(), userIds);
@@ -152,7 +152,9 @@
 			user.setRoleId(userInfo.getUser().getRoleId());
 			isRet = userService.updateUser(user);
 		} else {
-			Dept dept = deptService.getById(user.getDeptId());
+			// 将String类型的deptId转换为Long类型
+			Long deptIdLong = Long.parseLong(user.getDeptId());
+			Dept dept = deptService.getById(deptIdLong);
 			user.setAreaCode(HeaderUtils.processAreaCode(dept.getAreaCode()));
 			user.setPassword(DigestUtil.encrypt("jadk@2026"));
 			user.setDeptId(user.getDeptId() == null ? String.valueOf(dept.getId()) : user.getDeptId());

--
Gitblit v1.9.3