From deb25b1c56eafc4a8a9fc293b7807baad99e216c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 03 四月 2025 15:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java
index 410fd11..38b17d1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java
@@ -55,7 +55,6 @@
try {
jsonNode = objectMapper.readTree(response.body());
String accessToken = jsonNode.get("access_token").asText();
- Log.get().info("鑾峰彇浜轰簨绯荤粺token锛�" + accessToken);
redisTemplate.opsForValue().set("personnelAccessToken:idToken:", accessToken, jsonNode.get("expires_in").asInt() - 60, TimeUnit.SECONDS);
return accessToken;
} catch (Exception e) {
@@ -184,6 +183,7 @@
user.setIsCustom(0);
user.setPassword(SecurityUtils.encryptPassword("zttZTT123!"));
user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
+ user.setDeptId(personDto.getDeptId());
userMapper.insert(user);
} else {
user.setName(person.getName());
@@ -191,6 +191,7 @@
user.setEmail(person.getCompanyEmail());
user.setIsCustom(0);
user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
+ user.setDeptId(personDto.getDeptId());
userMapper.updateById(user);
}
});
--
Gitblit v1.9.3