Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
e2a96625
Unverified
Commit
e2a96625
authored
Sep 01, 2019
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎨
Cleanup code
parent
10c83912
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
src/main/java/org/b3log/solo/processor/console/CategoryConsole.java
...ava/org/b3log/solo/processor/console/CategoryConsole.java
+3
-2
src/main/java/org/b3log/solo/service/CategoryQueryService.java
...ain/java/org/b3log/solo/service/CategoryQueryService.java
+3
-2
No files found.
src/main/java/org/b3log/solo/processor/console/CategoryConsole.java
View file @
e2a96625
...
@@ -51,7 +51,8 @@ import java.util.Set;
...
@@ -51,7 +51,8 @@ import java.util.Set;
* Category console request processing.
* Category console request processing.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.3.5, Jul 22, 2019
* @author <a href="https://hacpai.com/member/lzh984294471">lzh984294471</a>
* @version 1.1.3.6, Sep 1, 2019
* @since 2.0.0
* @since 2.0.0
*/
*/
@RequestProcessor
@RequestProcessor
...
@@ -170,7 +171,7 @@ public class CategoryConsole {
...
@@ -170,7 +171,7 @@ public class CategoryConsole {
final
StringBuilder
tagBuilder
=
new
StringBuilder
();
final
StringBuilder
tagBuilder
=
new
StringBuilder
();
final
List
<
JSONObject
>
tags
=
(
List
<
JSONObject
>)
result
.
opt
(
Category
.
CATEGORY_T_TAGS
);
final
List
<
JSONObject
>
tags
=
(
List
<
JSONObject
>)
result
.
opt
(
Category
.
CATEGORY_T_TAGS
);
for
(
final
JSONObject
tag
:
tags
)
{
for
(
final
JSONObject
tag
:
tags
)
{
if
(
tag
==
null
||
!
tag
.
has
(
Tag
.
TAG_TITLE
)){
if
(
null
==
tag
||
!
tag
.
has
(
Tag
.
TAG_TITLE
))
{
// 修复修改分类时空指针错误 https://github.com/b3log/solo/pull/12876
continue
;
continue
;
}
}
tagBuilder
.
append
(
tag
.
optString
(
Tag
.
TAG_TITLE
)).
append
(
","
);
tagBuilder
.
append
(
tag
.
optString
(
Tag
.
TAG_TITLE
)).
append
(
","
);
...
...
src/main/java/org/b3log/solo/service/CategoryQueryService.java
View file @
e2a96625
...
@@ -43,7 +43,8 @@ import java.util.List;
...
@@ -43,7 +43,8 @@ import java.util.List;
* Category query service.
* Category query service.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.3, Jan 15, 2019
* @author <a href="https://hacpai.com/member/lzh984294471">lzh984294471</a>
* @version 1.0.1.4, Sep 1, 2019
* @since 2.0.0
* @since 2.0.0
*/
*/
@Service
@Service
...
@@ -115,7 +116,7 @@ public class CategoryQueryService {
...
@@ -115,7 +116,7 @@ public class CategoryQueryService {
for
(
final
JSONObject
relation
:
relations
)
{
for
(
final
JSONObject
relation
:
relations
)
{
final
String
tagId
=
relation
.
optString
(
Tag
.
TAG
+
"_"
+
Keys
.
OBJECT_ID
);
final
String
tagId
=
relation
.
optString
(
Tag
.
TAG
+
"_"
+
Keys
.
OBJECT_ID
);
final
JSONObject
tag
=
tagRepository
.
get
(
tagId
);
final
JSONObject
tag
=
tagRepository
.
get
(
tagId
);
if
(
tag
==
null
){
if
(
null
==
tag
)
{
// 修复修改分类时空指针错误 https://github.com/b3log/solo/pull/12876
continue
;
continue
;
}
}
ret
.
add
(
tag
);
ret
.
add
(
tag
);
...
...
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