创建员工流程

app/ghs/controllers/ShopAdminController.php

@@ -2,8 +2,8 @@
 
 namespace ghs\controllers;
 
-use biz\admin\classes\ShopAdminClass;
-use biz\admin\services\AdminRoleService;
+use bizGhs\admin\classes\ShopAdminClass;
+use bizGhs\admin\services\AdminRoleService;
 use bizGhs\admin\services\ShopAdminService;
 use biz\wx\services\WxOpenService;
 use common\components\jwt;
@@ -20,7 +20,7 @@ class ShopAdminController extends BaseController
 		$post = Yii::$app->request->post();
 		$roleId = isset($post['roleId']) ? $post['roleId'] : 0;
 		$role = AdminRoleService::getById($roleId);
-		if (empty($role) || isset($role['merchantId']) != $this->merchantId) {
+		if (empty($role) || isset($role['ghsId']) != $this->ghsId) {
 			util::fail('请选择角色！');
 		}
 		unset($post['userId']);

biz-ghs/admin/services/ShopAdminService.php

@@ -107,11 +107,20 @@ class ShopAdminService extends BaseService
 		
 		foreach ($list as $key => $val) {
 			$adminId = $val['adminId'];
-			$current = isset($adminBaseInfo[$adminId]) ? $adminBaseInfo[$adminId] : [];
-			$list[$key]['adminBaseInfo'] = $current;
 			$roleId = $val['roleId'];
 			$roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
 			$list[$key]['roleName'] = $roleName;
+			$currentAdmin = isset($adminBaseInfo[$adminId]) ? $adminBaseInfo[$adminId] : [];
+			$list[$key]['adminName'] = isset($currentAdmin['adminName']) ? $currentAdmin['adminName'] : '';
+			//帐号状态
+			$status = 1;
+			if (isset($currentAdmin['accountStatus']) && $currentAdmin['accountStatus'] == 0) {
+				$status = 0;
+			}
+			if (isset($val['status']) && $val['status'] == 0) {
+				$status = 0;
+			}
+			$list[$key]['status'] = $status;
 		}
 		$data['list'] = $list;
 		return $data;
@@ -157,7 +166,6 @@ class ShopAdminService extends BaseService
 		$adminInfo['adminId'] = isset($relation['adminId']) ? $relation['adminId'] : 0;
 		$adminInfo['roleId'] = isset($relation['roleId']) ? $relation['roleId'] : 0;
 		$adminInfo['remind'] = isset($relation['remind']) ? $relation['remind'] : 0;
-		$adminInfo['shop'] = $relation;
 		return $adminInfo;
 	}