Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
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
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
3ab28ba2
Commit
3ab28ba2
authored
4 years ago
by
dengshichuan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dsc' into 'develop'
Dsc See merge request 8timerv2/8timerapiv200!214
parents
bb5c2eb8
fb050061
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
13 deletions
+11
-13
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
+11
-12
src/main/java/cn/timer/api/controller/qyzx/QyzxAuthController.java
+0
-1
No files found.
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
View file @
3ab28ba2
...
@@ -358,8 +358,8 @@ public class CmsController {
...
@@ -358,8 +358,8 @@ public class CmsController {
// 查询条件
// 查询条件
QueryWrapper
<
CmsContent
>
queryWrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
CmsContent
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"organization_id"
,
userBean
.
getOrgCode
())
queryWrapper
.
eq
(
"organization_id"
,
userBean
.
getOrgCode
())
.
select
(
"id"
,
"publisher_name"
,
"auditopinion"
,
"modularid"
,
"status"
,
"title"
,
"releasetime"
,
"addeddate"
,
"author
"
,
.
select
(
"id"
,
"publisher_name"
,
"auditopinion"
,
"modularid"
,
"status"
,
"title"
,
"releasetime
"
,
"summary"
,
"releasetype"
,
"fmtpath"
)
"
addeddate"
,
"author"
,
"
summary"
,
"releasetype"
,
"fmtpath"
)
.
ne
(
"status"
,
1
).
eq
(
t
!=
null
&&
t
>
-
1
,
"modularid"
,
t
)
.
ne
(
"status"
,
1
).
eq
(
t
!=
null
&&
t
>
-
1
,
"modularid"
,
t
)
.
between
(!
StrUtil
.
hasBlank
(
s
)
&&
!
StrUtil
.
hasBlank
(
e
),
"releasetime"
,
.
between
(!
StrUtil
.
hasBlank
(
s
)
&&
!
StrUtil
.
hasBlank
(
e
),
"releasetime"
,
!
StrUtil
.
hasBlank
(
s
)
?
s
:
"1000-01-01 00:00:00"
,
!
StrUtil
.
hasBlank
(
s
)
?
s
:
"1000-01-01 00:00:00"
,
...
@@ -526,17 +526,16 @@ public class CmsController {
...
@@ -526,17 +526,16 @@ public class CmsController {
@ApiOperation
(
value
=
"设置默认轮播信息"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"设置默认轮播信息"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
Void
>
setDefault
(
@CurrentUser
UserBean
userBean
,
@PathVariable
(
"id"
)
Integer
id
)
{
public
Result
<
Void
>
setDefault
(
@CurrentUser
UserBean
userBean
,
@PathVariable
(
"id"
)
Integer
id
)
{
// 将所有设为非默认
// 将所有设为非默认
UpdateWrapper
<
CmsAnnouncement
>
updateWrapper
=
new
UpdateWrapper
<
CmsAnnouncement
>();
boolean
cmsAnnouncement
=
CmsAnnouncement
.
builder
().
isDefault
(
0
).
build
().
update
(
CmsAnnouncement
q
=
CmsAnnouncement
.
builder
().
orgCode
(
userBean
.
getOrgCode
()).
isDefault
(
0
).
build
();
new
LambdaQueryWrapper
<
CmsAnnouncement
>().
eq
(
CmsAnnouncement:
:
getOrgCode
,
userBean
.
getOrgCode
()));
cmsAnnouncementMapper
.
update
(
q
,
updateWrapper
);
// 根据id设为默认
// 根据id设为默认
updateWrapper
.
eq
(
"id"
,
id
);
if
(
cmsAnnouncement
)
{
CmsAnnouncement
w
=
CmsAnnouncement
.
builder
().
orgCode
(
userBean
.
getOrgCode
()).
id
(
id
).
isDefault
(
1
).
build
();
if
(
CmsAnnouncement
.
builder
().
id
(
id
).
isDefault
(
1
).
build
().
updateById
())
cmsAnnouncementMapper
.
update
(
w
,
updateWrapper
);
return
ResultUtil
.
success
(
"设置成功"
);
else
// 返回成功
return
ResultUtil
.
success
(
"设置失败"
);
return
ResultUtil
.
success
(
"设置成功"
);
}
return
ResultUtil
.
success
(
"设置失败"
);
}
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/qyzx/QyzxAuthController.java
View file @
3ab28ba2
...
@@ -11,7 +11,6 @@ import java.util.ArrayList;
...
@@ -11,7 +11,6 @@ import java.util.ArrayList;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.Comparator
;
import
java.util.Comparator
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
...
This diff is collapsed.
Click to expand it.
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