权限编辑

app/business/controllers/AdminRoleController.php

@@ -44,7 +44,7 @@ class AdminRoleController extends BaseController
 	//角色删除 shish 2019.12.10
 	public function actionDelete()
 	{
-		$id = Yii::$app->request->get('id', 0);
+		$id = Yii::$app->request->post('id', 0);
 		$role = AdminRoleService::getById($id);
 		AdminRoleService::valid($role, $this->merchantId);
 		AdminRoleService::deleteRole($role);

biz/admin/classes/AdminRoleClass.php

@@ -38,9 +38,10 @@ class AdminRoleClass extends BaseClass
 	//获取商家角色列表 shish 2019.12.10
 	public static function getRoleList($merchantId)
 	{
-		return self::getList('*', ['merchantId' => $merchantId], 'addTime DESC');
+		$where = ['merchantId' => $merchantId, 'delStatus' => 0];
+		return self::getList('*', $where, 'addTime DESC');
 	}
-	
+
 	//获取商家所有的角色名称 shish 2019.12.10
 	public static function getNameList($merchantId)
 	{
@@ -70,7 +71,7 @@ class AdminRoleClass extends BaseClass
 			util::fail('还有成员，不能删除');
 		}
 		$id = $role['id'];
-		return self::deleteById($id);
+		return self::updateById($id, ['delStatus' => 1]);
 	}
 	
 	//创建管理员角色 shish 2020.2.8
@@ -78,5 +79,5 @@ class AdminRoleClass extends BaseClass
 	{
 		return self::add($data);
 	}
-
+	
 }

console/controllers/UpgradeController.php

@@ -1285,6 +1285,10 @@ distance DECIMAL(6,1) NOT NULL DEFAULT 0.0 COMMENT '距离',
 		
 		$sql = "ALTER TABLE `xhOrder` ADD `hasDeliver` TINYINT NOT NULL DEFAULT 0 COMMENT '0未确认 1有手写配送单 2填电子单' AFTER `sendStatus`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
+
+		$sql = "ALTER TABLE `xhAdminRole` ADD `delStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '删除状态 0未删除 1已删除' AFTER `addTime`;";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+
 	}
 	
 	//数据迁移 shish 2020.1.12