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
d92463ef
Commit
d92463ef
authored
Mar 15, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
3a1b0bee
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
WorkTimeOrderMapper.xml
...-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml
+1
-1
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+1
-4
No files found.
wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml
View file @
d92463ef
...
...
@@ -440,7 +440,7 @@
</foreach>
</if>
</where>
ORDER BY
d.sort,u.name
ORDER BY
CONVERT( u.name USING gbk )
</select>
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
d92463ef
...
...
@@ -940,7 +940,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
INPUT_PARAM_IS_NULL
);
}
WorkUser
user
=
workUserService
.
getById
(
userId
);
List
<
Integer
>
ranks
=
UserRoleLevelUtils
.
getRankByUserAndLevelName
(
userId
,
LevelEnum
.
PROJECT_MANAGER
.
getLevelName
());
List
<
Integer
>
ranks
=
UserRoleLevelUtils
.
getRankByUserAndLevelName
(
userId
,
LevelEnum
.
USER_STATISTICS
.
getLevelName
());
if
(
CollectionUtils
.
isEmpty
(
ranks
))
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN
);
}
...
...
@@ -998,7 +998,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
deptUserDtos
.
add
(
deptUserDto
);
}
for
(
DeptUserDto
deptUserDto
:
deptUserDtos
)
{
List
<
UserDto
>
userDtos
=
new
ArrayList
<>();
for
(
DeptUserCollectDto
deptUserCollectDto
:
deptNotOrderInfo
)
{
...
...
@@ -1016,9 +1015,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
deptUserDto
.
setUserDtos
(
userDtos
);
}
notWorkSubmitOrderDto
.
setDeptUserDtos
(
deptUserDtos
);
return
notWorkSubmitOrderDto
;
}
...
...
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