完善功能

app/admin/service/sys_manage/UserService.php

@@ -33,6 +33,14 @@ class UserService
             ->forPage($page, $pageSize)
             ->get()
             ->toArray();
+        foreach($rows as &$item){
+            if(!empty($item['user_extend_json'])){
+                $extendJson = json_decode($item['user_extend_json'],true);
+                $item['avatar'] = !empty($extendJson['avatar']) ? getenv('STORAGE_DOMAIN').$extendJson['avatar'] : '';
+                $item['info'] = $extendJson['info'] ?? '';
+            }
+            
+        }
         $total = SysUser::when($username != '', function ($query) use ($username) {
             $query->where('user_name', 'like', '%' . $username . '%');
         })->count();
@@ -93,9 +101,12 @@ class UserService
                 'user_login_pass' => md5(sha1($params['user_login_pass'])),
                 'user_mobile' => $params['user_mobile'] ?? '',
                 'user_remark' => $params['user_remark'] ?? '',
-                'user_extend_json' => !empty($params['user_extend_json']) ? $params['user_extend_json'] : '{}',
+                // 'user_extend_json' => !empty($params['user_extend_json']) ? $params['user_extend_json'] : '{}',
                 'user_addtimes' => time()
             ];
+            $extendJson['avatar'] = str_replace(getenv('STORAGE_DOMAIN'),'',$params['avatar']);
+            $extendJson['info'] = $params['info'];
+            $data['user_extend_json'] = json_encode($extendJson);
             if (!SysUser::insert($data)) {
                 throw new \Exception('添加用户失败');
             }
@@ -127,8 +138,19 @@ class UserService
                 'user_category' => $params['user_category'],
                 'user_name' => $params['user_name'],
                 'user_remark' => $params['user_remark'],
-                'user_extend_json' => !empty($params['user_extend_json']) ? $params['user_extend_json'] : '{}'
+                // 'user_extend_json' => !empty($params['user_extend_json']) ? $params['user_extend_json'] : '{}'
             ];
+
+            $user = SysUser::where('user_id', $id)->first();
+            if(!empty($user->user_extend_json)){
+                $extendJson = json_decode($user->user_extend_json,true);
+            }else{
+                $extendJson = [];
+            }
+            $extendJson['avatar'] = str_replace(getenv('STORAGE_DOMAIN'),'',$params['avatar']);
+            $extendJson['info'] = $params['info'];
+            $data['user_extend_json'] = json_encode($extendJson);
+
             // 密码变动
             if (!empty($params['user_login_pass'])) {
                 $data['user_login_pass'] = md5(sha1($params['user_login_pass']));