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
c2fd5480
Commit
c2fd5480
authored
Feb 03, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into chenqi
parents
93fa9c3e
4705e650
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
3 deletions
+6
-3
WorkCollectServiceImpl.java
...ava/cn/wisenergy/service/impl/WorkCollectServiceImpl.java
+1
-1
WorkUserServiceImpl.java
...n/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java
+1
-0
WorkProjectController.java
...nergy/web/admin/controller/app/WorkProjectController.java
+4
-0
WorkUserController.java
...isenergy/web/admin/controller/app/WorkUserController.java
+0
-2
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkCollectServiceImpl.java
View file @
c2fd5480
...
...
@@ -74,7 +74,7 @@ public class WorkCollectServiceImpl implements WorkCollectService {
}
List
<
CalendarDto
>
calendarDtoList
=
workCollectMapper
.
getWorkMonth
(
userId
,
workMonth
);
if
(
CollectionUtils
.
isEmpty
(
calendarDtoList
))
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
WORK_ORDER_INFO_IS_NULL
);
calendarDtoList
.
add
(
new
CalendarDto
().
setWorkDay
(
DateUtil
.
getFirstDayOfMonth
(
workMonth
)).
setUserId
(
userId
)
);
}
return
calendarDtoList
;
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java
View file @
c2fd5480
...
...
@@ -115,6 +115,7 @@ public class WorkUserServiceImpl implements WorkUserService {
if
(
null
==
user
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
USER_LOGIN_NAME_OR_PASSWORD_IS_ERROR
);
}
// 是否离职状态
if
(
user
.
getStatus
()
!=
ON_THE_JOB_STATUS
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
LEAVE_JOB_USER
);
}
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkProjectController.java
View file @
c2fd5480
...
...
@@ -2,6 +2,7 @@ package cn.wisenergy.web.admin.controller.app;
import
io.swagger.annotations.Api
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.RestController
;
/**
...
...
@@ -14,4 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
public
class
WorkProjectController
{
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkUserController.java
View file @
c2fd5480
...
...
@@ -72,6 +72,4 @@ public class WorkUserController extends BaseController {
return
getResult
(
resultUser
);
}
}
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