From 2c47eb19390a70526d247200f8b5964ccd45c2b2 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 15 Mar 2024 16:54:21 +0800
Subject: [PATCH] * Fix bug #47035.

---
 module/user/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/user/model.php b/module/user/model.php
index 8546a94a00..906837aa3b 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -637,6 +637,7 @@ class userModel extends model
 
         $this->dao->begin();
 
+        if(!isset($user->type)) $user->type = $oldUser->type;
         if($user->type == 'outside' && $user->new) $user->company = $this->createCompany($user->newCompany);
 
         /* 获取所有的联系方式字段。*/
@@ -689,7 +690,7 @@ class userModel extends model
         {
             if(!empty($user->password)) $this->app->user->password = $user->password;
             $this->app->user->realname = $user->realname;
-            $this->app->user->role     = $user->role;
+            $this->app->user->role     = isset($user->role) ? $user->role : $oldUser->role;
         }
 
         return true;