Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
work_service
Project
Project
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
licc
work_service
Commits
c3a91864
Commit
c3a91864
authored
Mar 17, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
1e74a94a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+6
-2
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
c3a91864
...
...
@@ -836,7 +836,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
types
.
add
(
project
.
getType
());
}
});
}
else
{
}
else
{
projectIds
.
add
(-
1
);
types
.
add
(-
1
);
}
...
...
@@ -996,11 +996,15 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
if
(
LevelRankEnum
.
DEPARTMENT_LEVEL
.
getRank
().
equals
(
rankMax
))
{
deptIds
.
add
(
user
.
getDeptId
());
deptNotOrderInfo
=
workTimeOrderMapper
.
getDeptNotOrderInfo
(
userId
,
deptIds
,
startDate
,
endDate
);
DeptUserDto
deptUserDto
=
new
DeptUserDto
();
if
(!
CollectionUtils
.
isEmpty
(
deptNotOrderInfo
))
{
DeptUserDto
deptUserDto
=
new
DeptUserDto
();
deptUserDto
.
setDeptId
(
deptNotOrderInfo
.
get
(
0
).
getDeptId
());
deptUserDto
.
setDeptName
(
deptNotOrderInfo
.
get
(
0
).
getDeptName
());
deptUserDtos
.
add
(
deptUserDto
);
}
else
{
deptUserDto
.
setDeptId
(
user
.
getDeptId
());
deptUserDto
.
setDeptName
(
workDeptService
.
getById
(
user
.
getDeptId
()).
getDeptName
());
deptUserDtos
.
add
(
deptUserDto
);
}
}
if
(!
CollectionUtils
.
isEmpty
(
deptUserDtos
)
&&
!
CollectionUtils
.
isEmpty
(
deptNotOrderInfo
))
{
...
...
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