update
This commit is contained in:
parent
408da97ca7
commit
350d4f0454
@ -15,6 +15,7 @@
|
|||||||
namespace app\adminapi\logic\oa;
|
namespace app\adminapi\logic\oa;
|
||||||
|
|
||||||
|
|
||||||
|
use app\common\model\auth\Admin;
|
||||||
use app\common\model\dept\Dept;
|
use app\common\model\dept\Dept;
|
||||||
use app\common\model\dept\Orgs;
|
use app\common\model\dept\Orgs;
|
||||||
use app\common\model\oa\Flow;
|
use app\common\model\oa\Flow;
|
||||||
@ -123,6 +124,24 @@ class FlowLogic extends BaseLogic
|
|||||||
$data['flow_type'] = (string)$flow_cate['type'];
|
$data['flow_type'] = (string)$flow_cate['type'];
|
||||||
$data['org_name'] = $org['name'];
|
$data['org_name'] = $org['name'];
|
||||||
$data['dept_name'] = implode(',',$dept);
|
$data['dept_name'] = implode(',',$dept);
|
||||||
|
$flow_list = $data['flow_list'];
|
||||||
|
if(!empty($flow_list)){
|
||||||
|
foreach($flow_list as &$v){
|
||||||
|
if(!empty($v['flow_user'])){
|
||||||
|
$flow_user = Admin::field('id,name')->where('id','in',$v['flow_user'])->select()->toArray();
|
||||||
|
foreach ($flow_user as &$v2) {
|
||||||
|
unset($v2['role_id']);
|
||||||
|
}
|
||||||
|
$v['flow_user'] = $flow_user;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$data['flow_list'] = json_encode($flow_list);
|
||||||
|
$copy_user = Admin::field('id,name')->where('id','in',$data['copy_uids'])->select()->toArray();
|
||||||
|
foreach ($copy_user as &$v) {
|
||||||
|
unset($v['role_id']);
|
||||||
|
}
|
||||||
|
$data['copy_uids'] = $copy_user;
|
||||||
return $data->toArray();
|
return $data->toArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user