|
|
@@ -27,6 +27,7 @@ use app\model\api\Sys as SysModel;
|
|
|
use app\model\api\ShowTemplate;
|
|
|
use app\model\api\ShowTemplateOrder;
|
|
|
use app\model\api\UserShowTemplate;
|
|
|
+use app\model\api\UserWorkType;
|
|
|
use app\model\api\PayTrade as PayTradeModel;
|
|
|
|
|
|
use app\Request;
|
|
|
@@ -181,8 +182,8 @@ class User extends BaseController
|
|
|
public function getUserCardInfo(Request $request){
|
|
|
$data = (new InfoAudit)
|
|
|
->alias("u")
|
|
|
- ->field("u.*,wt.title as work_type_title")
|
|
|
- ->join("user_work_type wt","wt.id = u.work_type_id","left")
|
|
|
+ ->field("u.*,wt.title as user_work_type_title")
|
|
|
+ ->join("user_work_type wt","wt.id = u.user_work_type_id","left")
|
|
|
->where("u.uid",$request->user["uid"])
|
|
|
->where("u.status",1)
|
|
|
->order("u.id","desc")
|
|
|
@@ -258,6 +259,8 @@ class User extends BaseController
|
|
|
['education',''],
|
|
|
['minority',''],
|
|
|
|
|
|
+ ['user_work_type_id','0'],//服务职称
|
|
|
+
|
|
|
|
|
|
],$request);
|
|
|
if(!IdentityCard::isValid($post["idcard"])){
|
|
|
@@ -336,6 +339,14 @@ class User extends BaseController
|
|
|
$save["status"] = 0;
|
|
|
$save["time"] = time();
|
|
|
$save["uid"] = $request->user["uid"];
|
|
|
+
|
|
|
+ //服务职称
|
|
|
+ $save["user_work_type_id"] = empty($post["user_work_type_id"]) ? 0: (int)$post["user_work_type_id"];
|
|
|
+ if($save["user_work_type_id"]>0 && (new UserWorkType)->where("id",$post["user_work_type_id"])->where("status",1)->count()<=0){
|
|
|
+ return app('json')->fail("当前类型不能选择");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
$r = (new InfoAudit)->insertGetId($save);
|
|
|
if(!$r){
|
|
|
return app('json')->fail("系统错误");
|
yingzi