Commit c2fd5480 authored by nie'hong's avatar nie'hong

Merge branch 'master' into chenqi

parents 93fa9c3e 4705e650
...@@ -74,7 +74,7 @@ public class WorkCollectServiceImpl implements WorkCollectService { ...@@ -74,7 +74,7 @@ public class WorkCollectServiceImpl implements WorkCollectService {
} }
List<CalendarDto> calendarDtoList = workCollectMapper.getWorkMonth(userId, workMonth); List<CalendarDto> calendarDtoList = workCollectMapper.getWorkMonth(userId, workMonth);
if (CollectionUtils.isEmpty(calendarDtoList)) { 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; return calendarDtoList;
} }
......
...@@ -115,6 +115,7 @@ public class WorkUserServiceImpl implements WorkUserService { ...@@ -115,6 +115,7 @@ public class WorkUserServiceImpl implements WorkUserService {
if (null == user) { if (null == user) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.USER_LOGIN_NAME_OR_PASSWORD_IS_ERROR); throw new BaseCustomException(BASE_RESP_CODE_ENUM.USER_LOGIN_NAME_OR_PASSWORD_IS_ERROR);
} }
// 是否离职状态
if (user.getStatus() != ON_THE_JOB_STATUS) { if (user.getStatus() != ON_THE_JOB_STATUS) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.LEAVE_JOB_USER); throw new BaseCustomException(BASE_RESP_CODE_ENUM.LEAVE_JOB_USER);
} }
......
...@@ -2,6 +2,7 @@ package cn.wisenergy.web.admin.controller.app; ...@@ -2,6 +2,7 @@ package cn.wisenergy.web.admin.controller.app;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
/** /**
...@@ -14,4 +15,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -14,4 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j @Slf4j
public class WorkProjectController { public class WorkProjectController {
} }
...@@ -72,6 +72,4 @@ public class WorkUserController extends BaseController { ...@@ -72,6 +72,4 @@ public class WorkUserController extends BaseController {
return getResult(resultUser); return getResult(resultUser);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment