Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pisns-forum-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
scrmGroup
pisns-forum-api
Commits
717640fb
Commit
717640fb
authored
Aug 25, 2015
by
黄广星
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
移动端 公告接口加入 entcode
parent
d0dba767
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
forumNotice.js
app/controllers/mobile/forumNotice.js
+3
-2
No files found.
app/controllers/mobile/forumNotice.js
View file @
717640fb
...
...
@@ -94,7 +94,7 @@ router.get('/notice/newestMsg', function(req, res, next) {
pageSize
=
req
.
query
.
pageSize
,
plate
=
req
.
query
.
plate
;
var
_condition
=
{
status
:
1
,
type
:
2
},
_sort
=
{
top
:
-
1
,
createtime
:
-
1
};
var
_condition
=
{
status
:
1
,
type
:
2
,
ent_code
:
req
.
session
.
openUser
.
ent_code
},
_sort
=
{
top
:
-
1
,
createtime
:
-
1
};
if
(
plate
){
_condition
.
$or
=
[{
plate
:
plate
},{
plate
:
null
}];
}
else
{
...
...
@@ -125,6 +125,7 @@ router.get('/notice/newestAct', function(req, res, next) {
var
curdate
=
new
Date
(),
_condition
=
{
status
:
1
,
finished
:
0
,
type
:
1
,
,
ent_code
:
req
.
session
.
openUser
.
ent_code
,
startdate
:{
$lte
:
curdate
},
indate
:{
$gte
:
curdate
},
},
_sort
=
{
top
:
-
1
,
startdate
:
-
1
};
...
...
@@ -155,7 +156,7 @@ router.get('/notice/oldAct', function(req, res, next) {
pageSize
=
req
.
query
.
pageSize
,
plate
=
req
.
query
.
plate
,
curdate
=
new
Date
(),
_condition
=
{
status
:
1
,
type
:
1
,
$or
:[{
indate
:{
$lt
:
curdate
}},{
finished
:
1
}]},
_condition
=
{
status
:
1
,
type
:
1
,
ent_code
:
req
.
session
.
openUser
.
ent_code
,
$or
:[{
indate
:{
$lt
:
curdate
}},{
finished
:
1
}]},
_sort
=
{
top
:
-
1
,
indate
:
-
1
};
if
(
plate
){
_condition
.
$or
=
[{
plate
:
plate
},{
plate
:
null
}];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment