From a5e9e5e786435760b1a6eec5a81e1ca29c61ae56 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 11 Feb 2026 11:05:21 +0800
Subject: [PATCH] 区划为空，则使用默认的
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 0ed4755..f76ddcb 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
@@ -12,6 +12,8 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.DigestUtil;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -80,7 +82,7 @@
String times = OrderNumUtils.initOrderNum2(WordOrderConstant.ORG_CODE);
String deptCode = WordOrderConstant.ORG_PREFIX + times;
deptEntity.setDeptCode(deptCode);
- deptEntity.setAreaCode(HeaderUtils.processAreaCode(dept.getAreaCode()));
+ deptEntity.setAreaCode(HeaderUtils.processAreaCode(StringUtil.isNotBlank(dept.getAreaCode()) ? dept.getAreaCode() : "3608"));
deptEntity.setCreateTime(new Date());
deptEntity.setUpdateTime(new Date());
if (deptService.submit(deptEntity)) {
@@ -144,9 +146,9 @@
user.setRoleId(userInfo.getUser().getRoleId());
isRet = userService.updateUser(user);
} else {
- Dept dept = deptService.getById(1123598813738675201L);
+ Dept dept = deptService.getById(user.getDeptId());
user.setAreaCode(HeaderUtils.processAreaCode(dept.getAreaCode()));
- user.setPassword("jadk@2026");
+ user.setPassword(DigestUtil.encrypt("jadk@2026"));
user.setDeptId(user.getDeptId() == null ? String.valueOf(dept.getId()) : user.getDeptId());
user.setRoleId(user.getRoleId() == null ? "2011678430358691842" : user.getRoleId());
isRet = userService.save(user);
--
Gitblit v1.9.3