|
@@ -50,9 +50,9 @@ use think\Exception;use think\model\concern\SoftDelete;class WorkSubscr extends
|
|
|
$info = self::findOrEmpty($id);
|
|
$info = self::findOrEmpty($id);
|
|
|
if($info->is_check==1) throw new \Exception("功能权限申请存在数据未审核",1004);
|
|
if($info->is_check==1) throw new \Exception("功能权限申请存在数据未审核",1004);
|
|
|
$list = WorkSubinfo::where(["sub_id"=>$id,"status"=>1])->column("action_id,type");
|
|
$list = WorkSubinfo::where(["sub_id"=>$id,"status"=>1])->column("action_id,type");
|
|
|
- $result = $info->action;
|
|
|
|
|
- $tempAdd=[];
|
|
|
|
|
- $tempRemove=[];
|
|
|
|
|
|
|
+ $result = $info->role_action;
|
|
|
|
|
+ $tempAdd=[];
|
|
|
|
|
+ $tempRemove=[];
|
|
|
if(!empty($list)){
|
|
if(!empty($list)){
|
|
|
foreach ($list as $item){
|
|
foreach ($list as $item){
|
|
|
if($item['type']==1) $tempAdd[]=$item['action_id'];
|
|
if($item['type']==1) $tempAdd[]=$item['action_id'];
|
