mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
chenbo 2023-10-07 17:35:38 +08:00
commit a15fef8584
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/model/informationg/UserInformationg.php
View File

@ -112,18 +112,17 @@ class UserInformationg extends BaseModel
$item = self::where('id', $id)->field('*,area_id area_name,street_id street_name,village_id village_name,brigade_id brigade_name')->find(); $item = self::where('id', $id)->field('*,area_id area_name,street_id street_name,village_id village_name,brigade_id brigade_name')->find();
$item['family'] = json_decode($item['family'], true); $item['family'] = json_decode($item['family'], true);
$item['child_arr'] = json_decode($item['child_arr'], true); $item['child_arr'] = json_decode($item['child_arr'], true);
$data = UserInformationgDemand::where('information_id', $id)->order('id', 'desc')->select(); $data = UserInformationgDemand::where('information_id', $id)->order('id', 'desc')->select()->toArray();
$item['datas'] = []; $item['datas'] = [];
$datas = []; $datas = [];
if ($data) { if ($data) {
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
$a = json_decode($v['data'], true);
$arr = [ $arr = [
'id' => $v['category_child'], 'id' => $v['category_child'],
'update_time' => $v['update_time'], 'update_time' => $v['update_time'],
'datas' => $a 'datas' => $v['data']
]; ];
if ($a) { if ($v['data']) {
array_push($datas, $arr); array_push($datas, $arr);
} }
} }