Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-enterprise
Commits
1fa5216c
Commit
1fa5216c
authored
Apr 24, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
f08238dd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
AuditLogApiServiceImpl.java
...enterprise/service/outer/impl/AuditLogApiServiceImpl.java
+2
-3
No files found.
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AuditLogApiServiceImpl.java
View file @
1fa5216c
...
...
@@ -37,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.Collections
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -118,12 +117,12 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
// 判断有没有审核员, 没有审核员就返回错误
ServiceResponse
<
List
<
AuditorDTO
>>
auditorResponse
=
auditorApiService
.
listAuditorByProject
(
auditLogDTO
.
getProjectItemId
(),
auditLogDTO
.
getApplyUserId
(),
auditLogDTO
.
getEnterpriseId
());
List
<
AuditorDTO
>
auditorList
=
Collections
.
emptyList
();
// 普通管理员需要判断是否有审核员
if
(!
auditorResponse
.
isSuccess
())
{
return
EnterpriseServiceResponse
.
failure
(
auditorResponse
.
getCode
(),
auditorResponse
.
getMessage
());
}
auditorList
=
auditorResponse
.
getResult
();
List
<
AuditorDTO
>
auditorList
=
auditorResponse
.
getResult
();
List
<
AuditorDTO
>
openidList
=
auditorList
.
stream
().
filter
(
e
->
StringUtils
.
isNotBlank
(
e
.
getOpenid
())).
collect
(
Collectors
.
toList
());
List
<
AuditorDTO
>
userIdList
=
auditorList
.
stream
().
filter
(
e
->
e
.
getUserId
()
!=
null
).
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isEmpty
(
openidList
)
&&
CollectionUtils
.
isEmpty
(
userIdList
))
{
...
...
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