员工问题

biz-ghs/shop/services/ShopAdminService.php

@@ -80,12 +80,14 @@ class ShopAdminService extends BaseService
                 $shopAdmin->status = $status;
                 $shopAdmin->remark = $remark;
                 $shopAdmin->name = $name;
+                $shopAdmin->avatar = $avatar;
                 $shopAdmin->save();
-
                 $update = [
-                    'password' => $password,
                     'currentShopId' => $shopId
                 ];
+                if (!empty($password)) {
+                    $update['password'] = $password;
+                }
                 AdminClass::updateById($adminId, $update);
                 // 员工数+1
                 AdminRoleClass::counters(['num' => 1], ['id' => $roleId]);
@@ -95,9 +97,11 @@ class ShopAdminService extends BaseService
             util::fail('您已经是员工');
         }
         $update = [
-            'password' => $password,
             'currentShopId' => $shopId
         ];
+        if (!empty($password)) {
+            $update['password'] = $password;
+        }
         AdminClass::updateById($adminId, $update);
         $addData = [
             'adminId' => $adminId,

biz-hd/admin/services/ShopAdminService.php

@@ -78,9 +78,11 @@ class ShopAdminService extends BaseService
         // 添加员工方法
         $addShopAdminFunc = function () use ($name, $mobile, $password, $remark, $shopId, $adminId, $roleId) {
             $update = [
-                'password' => $password,
                 'currentShopId' => $shopId
             ];
+            if (!empty($password)) {
+                $update['password'] = $password;
+            }
             AdminClass::updateById($adminId, $update);
             // 员工数+1
             AdminRoleClass::counters(['num' => 1], ['id' => $roleId]);