|
@@ -83,7 +83,7 @@ class User extends BaseController
|
|
|
$data['show_template_code'] = "";
|
|
$data['show_template_code'] = "";
|
|
|
$data['show_template_id'] = "";
|
|
$data['show_template_id'] = "";
|
|
|
$tmpData = (new UserShowTemplate)
|
|
$tmpData = (new UserShowTemplate)
|
|
|
- ->field("t.id,t.code,t.title")
|
|
|
|
|
|
|
+ ->field("t.id,t.code,t.title,t.is_init,b.is_default")
|
|
|
->alias("b")
|
|
->alias("b")
|
|
|
->join("show_template t","t.id = b.show_template_id","left")
|
|
->join("show_template t","t.id = b.show_template_id","left")
|
|
|
->where("b.uid",$request->user['uid'])
|
|
->where("b.uid",$request->user['uid'])
|
|
@@ -91,8 +91,10 @@ class User extends BaseController
|
|
|
->order("b.id","desc")
|
|
->order("b.id","desc")
|
|
|
->find();
|
|
->find();
|
|
|
if(!empty($tmpData)){
|
|
if(!empty($tmpData)){
|
|
|
- $data['show_template_code'] = $tmpData["code"];
|
|
|
|
|
- $data['show_template_id'] = $tmpData["id"];
|
|
|
|
|
|
|
+ $data['show_template_code'] = $tmpData["code"];
|
|
|
|
|
+ $data['show_template_id'] = $tmpData["id"];
|
|
|
|
|
+ $data['show_template_init'] = $tmpData["is_init"];
|
|
|
|
|
+ $data['show_template_default'] = $tmpData["is_default"];
|
|
|
}
|
|
}
|
|
|
return app('json')->success($data);
|
|
return app('json')->success($data);
|
|
|
}
|
|
}
|