Merge branch 'master' into chenqi

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkCollectServiceImpl.java

@@ -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

@@ -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

@@ -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

@@ -72,6 +72,4 @@ public class WorkUserController extends BaseController {
         return getResult(resultUser);
     }
 
-
-
 }