diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/web/EmployeeCommonController.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/web/BaseCommonController.java similarity index 98% rename from jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/web/EmployeeCommonController.java rename to jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/web/BaseCommonController.java index 09a520d..f5c95eb 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/web/EmployeeCommonController.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/web/BaseCommonController.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import javax.servlet.http.HttpServletRequest; -public class EmployeeCommonController { +public class BaseCommonController { @Autowired private HrmCommonUtil hrmCommonUtil; @Autowired diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeInformationController.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeInformationController.java index 51f3088..46d7906 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeInformationController.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeInformationController.java @@ -3,7 +3,7 @@ package com.weaver.seconddev.jcl.organization.controller; import com.weaver.common.authority.annotation.WeaPermission; import com.weaver.common.base.entity.result.WeaResult; -import com.weaver.seconddev.jcl.common.web.EmployeeCommonController; +import com.weaver.seconddev.jcl.common.web.BaseCommonController; import com.weaver.seconddev.jcl.organization.entity.Employee; import com.weaver.seconddev.jcl.organization.entity.PendingEmployee; import com.weaver.seconddev.jcl.organization.service.EmployeeInformationService; @@ -27,7 +27,7 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("/api/secondev/jcl/employeeInformation") -public class EmployeeInformationController extends EmployeeCommonController { +public class EmployeeInformationController extends BaseCommonController { @Autowired private EmployeeInformationService employeeInformationService;