|
@@ -648,7 +648,7 @@ class Cost extends BaseController
|
|
|
|
|
|
$MsgData3 = [
|
|
|
"uid" =>$auditData2["approver"],//显示的文本,传来的id
|
|
|
- "project_id" => $param["project_id"],
|
|
|
+ "project_id" => $param["id"],
|
|
|
"content" => "您有一个新的待审批项目等待处理。" ."项目名称:".$auditData2["project_name"]." 申请人:".get_login_admin("nickname"),
|
|
|
"create_time" => time()
|
|
|
];
|
|
@@ -880,6 +880,8 @@ class Cost extends BaseController
|
|
|
}else{
|
|
|
$advent_time = null;
|
|
|
}
|
|
|
+ $detail["project_end_time"] !=null?$detail["project_end_time"]:null;
|
|
|
+ $detail["project_start_time"] !=null?$detail["project_start_time"]:null;
|
|
|
|
|
|
if (!empty($detail)) {
|
|
|
View::assign('advent_time', $advent_time);
|