|
|
@@ -170,7 +170,7 @@ class AdminClass extends BaseClass
|
|
|
if (!empty($unionAdmin)) {
|
|
|
//1、在小程序端已经授权用户信息和unionId之后，关注公众号时走这里
|
|
|
//2、关注了公众号或者H5已经授权时，并首次访问小程序
|
|
|
- $admin = self::updateAdminInfo($unionAdmin, $adminInfo);
|
|
|
+ $admin = self::updateAdmin($unionAdmin, $adminInfo);
|
|
|
} else {
|
|
|
$adminInfo['sourceType'] = $sourceId;
|
|
|
$admin = self::generateAdmin($adminInfo);
|
|
|
@@ -182,12 +182,13 @@ class AdminClass extends BaseClass
|
|
|
$admin = self::mergeAdmin($unionAdmin, $admin);
|
|
|
}
|
|
|
}
|
|
|
- $admin = self::updateAdminInfo($admin, $adminInfo);
|
|
|
+ $admin = self::updateAdmin($admin, $adminInfo);
|
|
|
}
|
|
|
return $admin;
|
|
|
}
|
|
|
-
|
|
|
- public static function updateAdminInfo($originalAdmin, $getAdminInfo)
|
|
|
+
|
|
|
+ //更新员工信息 shish 2020.5.30
|
|
|
+ public static function updateAdmin($originalAdmin, $getAdminInfo)
|
|
|
{
|
|
|
$data = [];
|
|
|
$adminId = $originalAdmin['id'];
|
shish