员工管理

app-ghs/controllers/ShopAdminController.php

@@ -95,7 +95,7 @@ class ShopAdminController extends BaseController
         $get = Yii::$app->request->get();
         $id = isset($get['id']) ? $get['id'] : 0;
         $respond = ShopAdminService::getAdminInfo($id);
-        ShopAdminClass::valid($respond, $this->sjId);
+        ShopAdminClass::valid($respond, $this->shopId);
         util::success($respond);
     }
 
@@ -103,17 +103,23 @@ class ShopAdminController extends BaseController
     public function actionUpdate()
     {
         $post = Yii::$app->request->post();
-        $id = isset($post['id']) && is_numeric($post['id']) ? $post['id'] : 0;
+        $id = $post['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('请选择员工');
+        }
         $relation = ShopAdminClass::getById($id, true);
+        if (empty($relation)) {
+            util::fail('没有找到员工');
+        }
         unset($post['id']);
-        $roleId = isset($post['roleId']) && !empty($post['roleId']) ? $post['roleId'] : 0;
-        $remind = isset($post['remind']) && !empty($post['remind']) ? $post['remind'] : 0;
+        $roleId = $post['roleId'] ?? 0;
+        $remind = $post['remind'] ?? 0;
+        $status = $post['status'] ?? 1;
         $relation->roleId = $roleId;
         $relation->remind = $remind;
+        $relation->status = $status;
         $relation->save();
-        $adminId = isset($relation->adminId) ? $relation->adminId : 0;
-        ShopAdminClass::valid($relation, $this->sjId);
-        AdminClass::updateById($adminId, $post);
+        ShopAdminClass::valid($relation, $this->shopId);
         util::complete('修改成功');
     }
 

biz-ghs/shop/classes/ShopAdminClass.php

@@ -76,9 +76,9 @@ class ShopAdminClass extends BaseClass
     }
 
     //权限判断 ssh 2021.1.13
-    public static function valid($admin, $merchantId)
+    public static function valid($admin, $shopId)
     {
-        if (isset($admin['merchantId']) && $admin['merchantId'] == $merchantId) {
+        if (isset($admin['shopId']) && $admin['shopId'] == $shopId) {
             return true;
         }
         util::fail('您没有权限操作');

biz-ghs/shop/services/ShopAdminService.php

@@ -155,17 +155,8 @@ class ShopAdminService extends BaseService
         if (empty($relation)) {
             util::fail('没有找到员工信息');
         }
-        $adminId = isset($relation['adminId']) ? $relation['adminId'] : 0;
-        if (empty($adminId)) {
-            util::fail('没有找到员工');
-        }
-        $adminInfo = AdminClass::getAdminById($adminId);
-        $adminInfo['shopId'] = isset($relation['shopId']) ? $relation['shopId'] : 0;
-        $adminInfo['merchantId'] = isset($relation['merchantId']) ? $relation['merchantId'] : 0;
-        $adminInfo['adminId'] = isset($relation['adminId']) ? $relation['adminId'] : 0;
-        $adminInfo['roleId'] = isset($relation['roleId']) ? $relation['roleId'] : 0;
-        $adminInfo['remind'] = isset($relation['remind']) ? $relation['remind'] : 0;
-        return $adminInfo;
+
+        return $relation;
     }
 
 }