master
wangxinglong 2021-12-22 11:55:02 +08:00
parent 93930445b6
commit 85ab2dc45a
1 changed files with 9 additions and 8 deletions

View File

@ -31,14 +31,15 @@ class CommentRepository extends Repository
return CommentModel::alias("a") return CommentModel::alias("a")
->join("account b" ,"a.user_code = b.user_code") ->join("account b" ,"a.user_code = b.user_code")
->where($whereMap) ->where($whereMap)
->whereOr( ->where(function ($q){
$q->whereOr(
[ [
["b.blank_time","=","null"], ["b.blank_time","=","null"],
["b.blank_time","=",""], ["b.blank_time","=",""],
["b.blank_time","<",date("Y-m-d H:i:s")], ["b.blank_time","<",date("Y-m-d H:i:s")],
] ]
);
) })
->field([ ->field([
"a.comment", "a.comment",
"a.user_code as userCode", "a.user_code as userCode",