|
|
@@ -81,7 +81,7 @@ class AdminShopService extends BaseService
|
|
|
AdminShopClass::delBindAdminData($shopId, $recommendAdminId);
|
|
|
return AdminShopClass::add($addData);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//获取管理员 shish 2020.4.21
|
|
|
public static function getAdminList($where)
|
|
|
{
|
|
|
@@ -90,16 +90,16 @@ class AdminShopService extends BaseService
|
|
|
if (empty($list)) {
|
|
|
return $data;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//管理员基础信息
|
|
|
$ids = array_column($list, 'adminId');
|
|
|
$adminInfo = AdminClass::getByIds($ids, null, 'id');
|
|
|
$adminBaseInfo = AdminClass::groupAdminBaseInfo($adminInfo);
|
|
|
-
|
|
|
+
|
|
|
$roleIds = array_column($list, 'roleId');
|
|
|
$roleIds = array_filter(array_unique($roleIds));
|
|
|
$roleList = AdminRoleClass::getByIds($roleIds, null, 'id');
|
|
|
-
|
|
|
+
|
|
|
foreach ($list as $key => $val) {
|
|
|
$adminId = $val['adminId'];
|
|
|
$current = isset($adminBaseInfo[$adminId]) ? $adminBaseInfo[$adminId] : [];
|
|
|
@@ -108,18 +108,22 @@ class AdminShopService extends BaseService
|
|
|
$roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
|
|
|
$list[$key]['roleName'] = $roleName;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$data['list'] = $list;
|
|
|
return $data;
|
|
|
}
|
|
|
|
|
|
+ //获取要通知的管理员 shish 2020.4.28
|
|
|
public static function getNoticeAdminList($shopId)
|
|
|
{
|
|
|
$where = ['shopId' => $shopId];
|
|
|
- $list = self::getAdminList($where);
|
|
|
- foreach ($list as $key => $val) {
|
|
|
- if (isset($val['remind']) && $val['remind'] == 0) {
|
|
|
- unset($list[$key]);
|
|
|
+ $respond = self::getAdminList($where);
|
|
|
+ $list = isset($respond['list']) ? $respond['list'] : [];
|
|
|
+ if (!empty($list)) {
|
|
|
+ foreach ($list as $key => $val) {
|
|
|
+ if (isset($val['remind']) && $val['remind'] == 0) {
|
|
|
+ unset($list[$key]);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return $list;
|
|
|
@@ -131,5 +135,5 @@ class AdminShopService extends BaseService
|
|
|
util::fail('不是您的员工');
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|