员工信息删除，权限节点优化

Signed-off-by: houhezheng <houhezheng@romens.cn>

backend/config/urlmanager.php

@@ -118,6 +118,7 @@ return [
                         'POST,OPTIONS employee-import' => 'employee-import',
                         'POST,OPTIONS employee-add' => 'employee-add',
                         'PUT,OPTIONS employee-update' => 'employee-update',
+                        'DELETE,OPTIONS employee-del' => 'employee-del',
                     ],
                 ],
                 //用户评论

backend/controllers/v1/authority/AuthorityNodeController.php

@@ -16,15 +16,15 @@ class AuthorityNodeController extends BaseController
     /**
      * 所有action，需要在权限范围内访问
      */
-    public function beforeAction($action)
-    {
-        $_action = parent::beforeAction($action);
-        $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
-        if ($userInfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN) {
-            throw new BadRequestHttpException('没有权限');
-        }
-        return $_action;
-    }
+    // public function beforeAction($action)
+    // {
+    //     $_action = parent::beforeAction($action);
+    //     $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
+    //     if ($userInfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN) {
+    //         throw new BadRequestHttpException('没有权限');
+    //     }
+    //     return $_action;
+    // }
 
     /**
      * 递归实现无限极分类
@@ -82,6 +82,9 @@ class AuthorityNodeController extends BaseController
                 case 2:
                     $show_name .= '|&nbsp&nbsp&nbsp&nbsp|-' . $v[$title];
                     break;
+                case 3:
+                    $show_name .= '|&nbsp&nbsp&nbsp&nbsp|&nbsp&nbsp&nbsp&nbsp|-' . $v[$title];
+                    break;
             }
 
             $return[$k] = $v;
@@ -108,7 +111,7 @@ class AuthorityNodeController extends BaseController
      *                  REMARK:描述,
      *                  SORT:菜单排序序号,
      *                  PID:父级菜单ID,
-     *                  LEVEL:菜单层级等级(类型-0:项目,1:模块,2:操作),
+     *                  LEVEL:菜单层级等级(类型-0:项目,1:模块,2:操作,3:动作),
      *                  SHOW_NAME:显示名称
      *                  "),
      *     security={{"Authorization":{}}}
@@ -149,7 +152,7 @@ class AuthorityNodeController extends BaseController
      *                 @OA\Property(property="REMARK", type="string",description="描述"),
      *                 @OA\Property(property="SORT", type="int",description="菜单排序序号"),
      *                 @OA\Property(property="PID", type="string",description="父级菜单ID(默认无：0)",example="0"), 
-     *                 @OA\Property(property="LEVEL",type="int",description="菜单层级等级(类型-0:项目,1:模块,2:操作)",example="0")
+     *                 @OA\Property(property="LEVEL",type="int",description="菜单层级等级(类型-0:项目,1:模块,2:操作,3:动作)",example="0")
      *             )
      *         )
      *     ),
@@ -171,7 +174,7 @@ class AuthorityNodeController extends BaseController
         $model = new $this->modelClass();
         $model->scenario = 'creation';
         $model->attributes = $params;
-        $model->ORG_GUID = isset(Yii::$app->user->identity->ORG_GUID) ? '100' : '100';
+        $model->ORG_GUID = Yii::$app->user->identity->ORG_GUID;
         //如果设置了默认显示，先判断是否有其他的默认显示页面，因为只能有一个，所以如果有其他节点是默认显示则将其去除
         if ($params['IS_DEFAULT_SHOW'] == 1) {
             $model->updateAll('IS_DEFAULT_SHOW', 'IS_DEFAULT_SHOW=1', ['IS_DEFAULT_SHOW' => 0]);
@@ -250,7 +253,7 @@ class AuthorityNodeController extends BaseController
      *                  REMARK:描述,
      *                  SORT:菜单排序序号,
      *                  PID:父级菜单ID,
-     *                  LEVEL:菜单层级等级(类型-0:项目,1:模块,2:操作)")
+     *                  LEVEL:菜单层级等级(类型-0:项目,1:模块,2:操作,3:动作)")
      *     ),
      *     security={{"Authorization":{}}}
      * )
@@ -291,7 +294,7 @@ class AuthorityNodeController extends BaseController
      *                 @OA\Property(property="REMARK", type="string",description="描述"),
      *                 @OA\Property(property="SORT", type="int",description="菜单排序序号"),
      *                 @OA\Property(property="PID", type="string",description="父级菜单ID(无：0)"), 
-     *                 @OA\Property(property="LEVEL",type="int",description="菜单层级等级(类型-0:项目,1:模块,2:操作)")
+     *                 @OA\Property(property="LEVEL",type="int",description="菜单层级等级(类型-0:项目,1:模块,2:操作,3:动作)")
      *             )
      *         )
      *     ),

backend/controllers/v1/shopuser/ShopEmployeeController.php

@@ -158,6 +158,9 @@ class ShopEmployeeController extends BaseController
                         $_model = clone $model;
                         $_model->GUID = Func::create_guid();
                         $_model->CODE = $value[2];
+                        $_model->BELONG = 1;
+                        $_model->CREATE_GUID = Yii::$app->user->identity->GUID;
+                        $_model->CREATE_NAME = Yii::$app->user->identity->NAME;
                         $_model->CREATE_DATE = date('Y-m-d H:i:s', time());
                     }
                     //性别
@@ -177,6 +180,8 @@ class ShopEmployeeController extends BaseController
                     $_model->EMPLOYEE_IS_MANAGER  = $value[6];
                     $_model->IS_DISTRIBUTOR = $value[7];
                     $_model->EMPLOYEE_BRANCH_GUID = $branch_info['GUID'];
+                    $_model->UPDATE_GUID = Yii::$app->user->identity->GUID;
+                    $_model->UPDATE_NAME = Yii::$app->user->identity->NAME;
                     $_model->UPDATE_DATE = date('Y-m-d H:i:s', time());
                     if (!$_model->save()) {
                         $transcation->rollBack();
@@ -243,7 +248,8 @@ class ShopEmployeeController extends BaseController
         $model->CODE = $params['MOBILE_PHONE'];
         $model->CREATE_GUID = Yii::$app->user->identity->GUID;
         $model->CREATE_NAME = Yii::$app->user->identity->NAME;
-        $model->CREATE_DATE = date('Y-m-d H:i:s');
+        $model->CREATE_DATE = date('Y-m-d H:i:s',time());
+        $model->BELONG = 1;
 
         if (!$model->save()) {
             Yii::$app->response->statusCode = 422;
@@ -266,6 +272,7 @@ class ShopEmployeeController extends BaseController
      *             @OA\Schema(
      *                 type="object",
      *                 required={"GUID","MOBILE_PHONE","BRANCH_CODE","NAME"},
+     *                 @OA\Property(property="GUID",type="string",description="员工guid"),
      *                 @OA\Property(property="NAME",type="string",description="员工姓名"),
      *                 @OA\Property(property="EMPLOYEE_CODE",type="string",description="员工编号"),
      *                 @OA\Property(property="MOBILE_PHONE",type="string",description="手机号"),
@@ -287,23 +294,73 @@ class ShopEmployeeController extends BaseController
     public function actionEmployeeUpdate()
     {
         $params = Yii::$app->request->bodyParams;
-        $model = new $this->modelClass();
-        $model->scenario = 'employeeUpdate';
         //过滤掉部分为空的参数
         foreach ($params as $key => $value) {
             if (in_array($key, ['EMPLOYEE_CODE', 'CONTACTBIRTH_DATE', 'IS_DISTRIBUTOR', 'EMPLOYEE_IS_MANAGER', 'PASSWORD']) && empty(trim($value))) {
                 unset($params[$key]);
             }
         }
-        $model->CODE = $params['MOBILE_PHONE'];
-        $model->UPDATE_GUID = Yii::$app->user->identity->GUID;
-        $model->UPDATE_NAME = Yii::$app->user->identity->NAME;
-        $model->UPDATE_DATE = date('Y-m-d H:i:s');
 
-        if (!$model->save()) {
+        $model = new $this->modelClass();
+        $_model = $model::findOne(['GUID' => $params['GUID']]);
+        if (!$_model) {
+            throw new BadRequestHttpException("不存在此员工！");
+        }
+        $_model->scenario = 'employeeUpdate';
+        $_model->CODE = $params['MOBILE_PHONE'];
+        $_model->UPDATE_GUID = Yii::$app->user->identity->GUID;
+        $_model->UPDATE_NAME = Yii::$app->user->identity->NAME;
+        $_model->UPDATE_DATE = date('Y-m-d H:i:s',time());
+
+        if (!$_model->save()) {
             Yii::$app->response->statusCode = 422;
-            return $model->errors;
+            return $_model->errors;
         }
         throw new HttpException(200, '更新成功！');
     }
+
+    /**
+     * @OA\Delete(
+     *     path="/backend/web/v1/shopuser/shop-employees/employee-del",
+     *     tags={"用户&员工接口"},
+     *     summary="删除员工信息(侯贺政)",
+     *     description="删除员工信息",
+     *     @OA\Parameter(
+     *         description="要删除员工GUIID",
+     *         in="query",
+     *         name="GUID",
+     *         required=true,
+     *         @OA\Schema(
+     *             type="string",
+     *         )
+     *     ),
+     *     @OA\Response(
+     *         response=200,
+     *         description="删除成功！"
+     *     ),
+     *     security={{"Authorization":{}}}
+     * )
+     */
+    public function actionEmployeeDel()
+    {
+        $guid = Yii::$app->request->get('GUID');
+        $model = new $this->modelClass();
+        $_model = $model::findOne($guid);
+        if (!$_model) {
+            throw new BadRequestHttpException("不存在此员工！");
+        }
+        $_model->IS_DISTRIBUTOR = 0;
+        $_model->BELONG = 0;
+        $_model->EMPLOYEE_CODE = '';
+        $_model->EMPLOYEE_BRANCH_GUID = '';
+        $_model->EMPLOYEE_IS_MANAGER = 0;
+        $_model->UPDATE_GUID = Yii::$app->user->identity->GUID;
+        $_model->UPDATE_NAME = Yii::$app->user->identity->NAME;
+        $_model->UPDATE_DATE = date('Y-m-d H:i:s',time());
+        if (!$_model->save(false)) {
+            Yii::$app->response->statusCode = 422;
+            return $_model->errors;
+        }
+        throw new HttpException(200, '删除成功！');
+    }
 }

backend/controllers/v1/transport/TransportSettingController.php

@@ -222,7 +222,7 @@ class TransportSettingController extends BaseController
                         $params['GUID'],
                         $value,
                         'TRANSPORTFEE',
-                        date('Y-m-d H:i:s')
+                        date('Y-m-d H:i:s',time())
                     ];
                 }
                 $keys = ['GUID', 'ORG_GUID', 'ACTIVITY_GUID', 'BRANCH_GUID', 'ACTIVITY_TYPE', 'CREATE_TIME'];
@@ -387,7 +387,7 @@ class TransportSettingController extends BaseController
                         $model->GUID,
                         $value,
                         'TRANSPORTFEE',
-                        date('Y-m-d H:i:s')
+                        date('Y-m-d H:i:s',time())
                     ];
                 }
                 $keys = ['GUID', 'ORG_GUID', 'ACTIVITY_GUID', 'BRANCH_GUID', 'ACTIVITY_TYPE', 'CREATE_TIME'];