Merge pull request 'mkm' (#1) from mkm into master

Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/1
This commit is contained in:
mkm 2023-08-01 17:29:31 +08:00
commit 58d17e6755

View File

@ -40,6 +40,8 @@ class UserInformationg extends BaseModel
'name' => $param['name'], 'name' => $param['name'],
'phone' => $param['phone'], 'phone' => $param['phone'],
'age' => $param['age'], 'age' => $param['age'],
'sex'=>$param['sex'],
'id_card'=>$param['id_card'],
'wechat' => $param['wechat'], 'wechat' => $param['wechat'],
'area_id' => $param['area_id'], 'area_id' => $param['area_id'],
'street_id' => $param['street_id'], 'street_id' => $param['street_id'],
@ -72,11 +74,17 @@ class UserInformationg extends BaseModel
public static function informationg_demand($param, $id, $admin_id) public static function informationg_demand($param, $id, $admin_id)
{ {
if(isset($param['card_id']) &&$param['card_id'] >0){
$category_id=Db::name('category_business')->where('id',$param['card_id'])->value('pid');
$category_child=$param['card_id'];
}else{
$category_id=0;
$category_child=0;
}
$data = [ $data = [
'create_user_id' => $admin_id, 'create_user_id' => $admin_id,
'category_id' => $param['category_id'] ?? 0, 'category_id' => $category_id,
'category_child' => $param['category_child'] ?? 0, 'category_child' => $category_child,
'data' => json_encode($param['datas']), 'data' => json_encode($param['datas']),
'create_time' => time(), 'create_time' => time(),
'update_time' => time(), 'update_time' => time(),
@ -98,9 +106,7 @@ class UserInformationg extends BaseModel
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
$a = json_decode($v['data'], true); $a = json_decode($v['data'], true);
$arr = [ $arr = [
'id' => $v['id'], 'id' => $v['category_child'],
'category_id' => $v['category_id'],
'category_child' => $v['category_child'],
'datas' => $a 'datas' => $a
]; ];
if ($a) { if ($a) {