From b716afd262ff60ff1db0b1e7c95800e7ad2b7202 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 07 七月 2025 11:07:37 +0800
Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java
index 8eeac90..314d70d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java
@@ -36,8 +36,8 @@
             if (!StringUtils.isEmpty(newUser.getBirthday())) {
                 oldUser.setBirthday(newUser.getBirthday());
             }
-            if (!StringUtils.isEmpty(newUser.getDeptid())) {
-                oldUser.setDeptid(newUser.getDeptid());
+            if (!StringUtils.isEmpty(newUser.getRoleid())) {
+                oldUser.setRoleid(newUser.getRoleid());
             }
             if (!StringUtils.isEmpty(newUser.getSex())) {
                 oldUser.setSex(newUser.getSex());
@@ -47,6 +47,10 @@
             }
             if (!StringUtils.isEmpty(newUser.getPhone())) {
                 oldUser.setPhone(newUser.getPhone());
+                oldUser.setAccount(newUser.getPhone());
+            }
+            if (!StringUtils.isEmpty(newUser.getIdCard())) {
+                oldUser.setIdCard(newUser.getIdCard());
             }
             return oldUser;
         }

--
Gitblit v1.7.1