From b6a42ed2c7bb93651a9a026afb3ee83449ed8256 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 11 Sep 2023 09:29:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java
index bd7ba1d..a023603 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java
@@ -133,14 +133,15 @@
userService.save(saveUser);
}
} else {
- //在，看status状态，若为1则删除用户。0更新？
- if (accountBean.getStatus().equals("1")) {
- userService.removeUser(accountBean.getPrincipalId());
- } else { //更新
+ //在，看status状态，若为1则删除用户。0更新？ 先不删除
+// if (accountBean.getStatus().equals("1")) {
+// userService.removeUser(accountBean.getPrincipalId());
+// } else { //更新
//设置姓名
one.setRealName(accountBean.getAttributes().get("realName"));
+ one.setName(accountBean.getAttributes().get("realName"));
userService.updateUser(one);
- }
+// }
}
}
--
Gitblit v1.9.3