Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
MeterSphere
Commits
d16cc9b5
Commit
d16cc9b5
authored
4 years ago
by
Captain.B
Committed by
刘瑞斌
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix: 修复查询工作空间下项目列表的问题
parent
a3292402
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
+6
-0
.../java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
backend/src/main/java/io/metersphere/controller/ProjectController.java
+1
-1
...ain/java/io/metersphere/controller/ProjectController.java
with
7 additions
and
1 deletion
+7
-1
backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
+
6
-
0
View file @
d16cc9b5
...
@@ -62,6 +62,12 @@
...
@@ -62,6 +62,12 @@
#{value}
#{value}
</foreach>
</foreach>
</when>
</when>
<when
test=
"key == 'workspace_id'"
>
AND p.workspace_id IN
<foreach
collection=
"values"
item=
"value"
separator=
","
open=
"("
close=
")"
>
#{value}
</foreach>
</when>
</choose>
</choose>
</if>
</if>
</foreach>
</foreach>
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/controller/ProjectController.java
+
1
-
1
View file @
d16cc9b5
...
@@ -90,7 +90,7 @@ public class ProjectController {
...
@@ -90,7 +90,7 @@ public class ProjectController {
if
(
StringUtils
.
isBlank
(
request
.
getProjectId
()))
{
if
(
StringUtils
.
isBlank
(
request
.
getProjectId
()))
{
List
<
String
>
sourceIds
=
SessionUtils
.
getUser
().
getUserGroups
().
stream
().
map
(
UserGroup:
:
getSourceId
).
collect
(
Collectors
.
toList
());
List
<
String
>
sourceIds
=
SessionUtils
.
getUser
().
getUserGroups
().
stream
().
map
(
UserGroup:
:
getSourceId
).
collect
(
Collectors
.
toList
());
request
.
setFilters
(
new
HashMap
<
String
,
List
<
String
>>()
{{
request
.
setFilters
(
new
HashMap
<
String
,
List
<
String
>>()
{{
put
(
"
project
_id"
,
sourceIds
);
put
(
"
workspace
_id"
,
sourceIds
);
}});
}});
}
}
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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