From c704de931ecab62b45b6135b5ebc1a63157d2856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90=E1=BA=B7ng=20Kh=C3=A1nh=20Trung?= Date: Fri, 21 Feb 2020 11:31:23 +0700 Subject: [PATCH] Update usermgt security --- .../usermgt/constants/ApplicantTerm.java | 1 + .../usermgt/constants/ResourceRoleTerm.java | 3 +- .../impl/ApplicantLocalServiceImpl.java | 36 +++++++++++-------- .../impl/EmployeeJobPosLocalServiceImpl.java | 14 +------- .../impl/EmployeeLocalServiceImpl.java | 2 +- .../service/impl/JobPosLocalServiceImpl.java | 15 +------- .../impl/JobPosWorkLocalServiceImpl.java | 12 ++----- .../impl/OfficeSiteLocalServiceImpl.java | 10 +----- .../impl/PreferencesLocalServiceImpl.java | 8 ----- .../impl/ResourceRoleLocalServiceImpl.java | 13 ++----- .../impl/ResourceUserLocalServiceImpl.java | 15 ++------ .../impl/WorkingUnitLocalServiceImpl.java | 13 +------ 12 files changed, 37 insertions(+), 105 deletions(-) diff --git a/modules/backend-usermgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ApplicantTerm.java b/modules/backend-usermgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ApplicantTerm.java index a1fe2697a1..2a07bd39ff 100644 --- a/modules/backend-usermgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ApplicantTerm.java +++ b/modules/backend-usermgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ApplicantTerm.java @@ -32,6 +32,7 @@ public class ApplicantTerm { public static final String TOTAL = "total"; public static final String DATA = "data"; public static final String PAGINATION_TYPE = "paginationType"; + public static final String REGULAR = "regular"; public static final int PASSWORD_LENGHT = 10; public static final String REPRE_ENTERPRISE = "representativeEnterprise"; diff --git a/modules/backend-usermgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ResourceRoleTerm.java b/modules/backend-usermgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ResourceRoleTerm.java index 2a13f5fc80..f3a3dee3ac 100644 --- a/modules/backend-usermgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ResourceRoleTerm.java +++ b/modules/backend-usermgt/backend-usermgt-api/src/main/java/org/opencps/usermgt/constants/ResourceRoleTerm.java @@ -56,7 +56,8 @@ public class ResourceRoleTerm { public static final String PAGINATION_TYPE = "paginationType"; public static final String SELECTED = "selected"; public static final String READONLY = "readonly"; - + public static final String REGULAR = "regular"; + private long resourceRoleId; private long groupId; diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ApplicantLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ApplicantLocalServiceImpl.java index c34c24edbd..f83cde79ba 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ApplicantLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ApplicantLocalServiceImpl.java @@ -19,7 +19,6 @@ import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.json.JSONObject; -import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.model.Role; @@ -383,8 +382,11 @@ public Applicant updateApplication(ServiceContext context, long groupId, long ap password = PwdGenerator.getPassword(ServiceProps.PASSWORD_LENGHT); } - String firstName = ("citizen".equals(applicantIdType) ? "Ông/bà" - : ("business".equals(applicantIdType) ? "Quý công ty" : "Tổ chức")); + String firstName = (ApplicantTerm.APPLICANTIDTYPE_CITIZEN.equals(applicantIdType) ? MessageUtil.getMessage( + ConfigConstants.HEADER_USER) + : (ApplicantTerm.APPLICANTIDTYPE_BUSINESS.equals(applicantIdType) ? MessageUtil.getMessage( + ConfigConstants.HEADER_COMPANY) : MessageUtil.getMessage( + ConfigConstants.HEADER_BUSSINESS))); String lastName = applicantName; UserMgtUtils.SplitName spn = UserMgtUtils.splitName(firstName, lastName); @@ -714,7 +716,7 @@ public Hits searchLucene(LinkedHashMap params, Sort[] sorts, int searchContext.addFullQueryEntryClassName(Applicant.class.getName()); searchContext.setEntryClassNames(new String[] { Applicant.class.getName() }); - searchContext.setAttribute("paginationType", "regular"); + searchContext.setAttribute(ApplicantTerm.PAGINATION_TYPE, ApplicantTerm.REGULAR); searchContext.setLike(true); searchContext.setStart(start); searchContext.setEnd(end); @@ -1176,12 +1178,12 @@ public Applicant importApplicationDB(long groupId, long userId, long applicantId User auditUser = userPersistence.fetchByPrimaryKey(userId); Applicant applicant = null; if (applicantId == 0) { - System.out.println("contactEmail: " + contactEmail + "| applicantId: " + applicantId); +// System.out.println("contactEmail: " + contactEmail + "| applicantId: " + applicantId); applicantId = counterLocalService.increment(Applicant.class.getName()); applicant = applicantPersistence.create(applicantId); try { - System.out.println("MAPPING USER ID: " + mappingUserId); +// System.out.println("MAPPING USER ID: " + mappingUserId); // Add audit field applicant.setCreateDate(now); applicant.setModifiedDate(now); @@ -1224,11 +1226,11 @@ public Applicant importApplicationDB(long groupId, long userId, long applicantId Applicant applicant = null; // String password = "12345"; String password = PwdGenerator.getPassword(4) + "1@#A"; - System.out.println("contactEmail: " + contactEmail + "| password: " + password); +// System.out.println("contactEmail: " + contactEmail + "| password: " + password); _log.info("contactEmail: " + contactEmail + "| password: " + password); if (applicantId == 0) { - System.out.println("contactEmail: " + contactEmail + "| applicantId: " + applicantId); +// System.out.println("contactEmail: " + contactEmail + "| applicantId: " + applicantId); applicantId = counterLocalService.increment(Applicant.class.getName()); applicant = applicantPersistence.create(applicantId); @@ -1252,8 +1254,11 @@ public Applicant importApplicationDB(long groupId, long userId, long applicantId password = PwdGenerator.getPassword(ServiceProps.PASSWORD_LENGHT); } - String firstName = ("citizen".equals(applicantIdType) ? "Ông/bà" - : ("business".equals(applicantIdType) ? "Quý công ty" : "Tổ chức")); + String firstName = (ApplicantTerm.APPLICANTIDTYPE_CITIZEN.equals(applicantIdType) ? MessageUtil.getMessage( + ConfigConstants.HEADER_USER) + : (ApplicantTerm.APPLICANTIDTYPE_BUSINESS.equals(applicantIdType) ? MessageUtil.getMessage( + ConfigConstants.HEADER_COMPANY) : MessageUtil.getMessage( + ConfigConstants.HEADER_BUSSINESS))); String lastName = applicantName; UserMgtUtils.SplitName spn = UserMgtUtils.splitName(firstName, lastName); @@ -1282,13 +1287,13 @@ public Applicant importApplicationDB(long groupId, long userId, long applicantId StringPool.BLANK, LocaleUtil.getDefault(), spn.getFirstName(), spn.getMidName(), spn.getLastName(), 0, 0, true, month, dayOfMonth, year, ServiceProps.APPLICANT_JOB_TITLE, groupIds, organizationIds, roleIds, userGroupIds, sendEmail, context); - System.out.println("MAPPING USER: " + mappingUser.getLastName() + "," + mappingUser.getFullName()); +// System.out.println("MAPPING USER: " + mappingUser.getLastName() + "," + mappingUser.getFullName()); // mappingUser.setStatus(WorkflowConstants.STATUS_APPROVED); userLocalService.updateStatus(mappingUser.getUserId(), WorkflowConstants.STATUS_APPROVED, context); // long mappingUserId = mappingUser.getUserId(); - System.out.println("MAPPING USER ID: " + mappingUserId); +// System.out.println("MAPPING USER ID: " + mappingUserId); // Add audit field applicant.setCreateDate(now); applicant.setModifiedDate(now); @@ -1403,8 +1408,11 @@ public Applicant updateApplicationDB(long groupId, long userId, long applicantId secretCode = PwdGenerator.getPassword(ServiceProps.PASSWORD_LENGHT); } - String firstName = ("citizen".equals(applicantIdType) ? "Ông/bà" - : ("business".equals(applicantIdType) ? "Quý công ty" : "Tổ chức")); + String firstName = (ApplicantTerm.APPLICANTIDTYPE_CITIZEN.equals(applicantIdType) ? MessageUtil.getMessage( + ConfigConstants.HEADER_USER) + : (ApplicantTerm.APPLICANTIDTYPE_BUSINESS.equals(applicantIdType) ? MessageUtil.getMessage( + ConfigConstants.HEADER_COMPANY) : MessageUtil.getMessage( + ConfigConstants.HEADER_BUSSINESS))); String lastName = applicantName; UserMgtUtils.SplitName spn = UserMgtUtils.splitName(firstName, lastName); diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/EmployeeJobPosLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/EmployeeJobPosLocalServiceImpl.java index b9a2cbb113..d91de99c6d 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/EmployeeJobPosLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/EmployeeJobPosLocalServiceImpl.java @@ -14,19 +14,6 @@ package org.opencps.usermgt.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; - -import org.opencps.backend.usermgt.service.util.ConfigConstants; -import org.opencps.usermgt.constants.EmployeeJobPosTerm; -import org.opencps.usermgt.model.Employee; -import org.opencps.usermgt.model.EmployeeJobPos; -import org.opencps.usermgt.model.JobPos; -import org.opencps.usermgt.service.JobPosLocalServiceUtil; -import org.opencps.usermgt.service.base.EmployeeJobPosLocalServiceBaseImpl; - import com.liferay.asset.kernel.exception.DuplicateCategoryException; import com.liferay.counter.kernel.service.CounterLocalServiceUtil; import com.liferay.petra.string.StringPool; @@ -62,6 +49,7 @@ import java.util.LinkedHashMap; import java.util.List; +import org.opencps.backend.usermgt.service.util.ConfigConstants; import org.opencps.usermgt.constants.EmployeeJobPosTerm; import org.opencps.usermgt.model.Employee; import org.opencps.usermgt.model.EmployeeJobPos; diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/EmployeeLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/EmployeeLocalServiceImpl.java index 81dde692a5..14f4543d65 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/EmployeeLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/EmployeeLocalServiceImpl.java @@ -1109,7 +1109,7 @@ public Employee adminProcessData(JSONObject objectData) { Employee object = null; - if (objectData.getLong("employeeId") > 0) { + if (objectData.getLong(EmployeeTerm.EMPLOYEE_ID) > 0) { object = employeePersistence.fetchByPrimaryKey(objectData.getLong(EmployeeTerm.EMPLOYEE_ID)); diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosLocalServiceImpl.java index d7ef889c96..04b9196380 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosLocalServiceImpl.java @@ -14,20 +14,6 @@ package org.opencps.usermgt.service.impl; -import java.util.Date; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import org.opencps.backend.usermgt.service.util.ConfigConstants; -import org.opencps.usermgt.constants.JobPosTerm; -import org.opencps.usermgt.constants.UserMGTConstants; -import org.opencps.usermgt.exception.NoSuchJobPosException; -import org.opencps.usermgt.model.JobPos; -import org.opencps.usermgt.service.base.JobPosLocalServiceBaseImpl; - import com.liferay.asset.kernel.exception.DuplicateCategoryException; import com.liferay.counter.kernel.service.CounterLocalServiceUtil; import com.liferay.petra.string.StringPool; @@ -69,6 +55,7 @@ import java.util.Locale; import java.util.Map; +import org.opencps.backend.usermgt.service.util.ConfigConstants; import org.opencps.usermgt.constants.JobPosTerm; import org.opencps.usermgt.constants.UserMGTConstants; import org.opencps.usermgt.exception.NoSuchJobPosException; diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosWorkLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosWorkLocalServiceImpl.java index 79a71e2b06..0c74853f6e 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosWorkLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/JobPosWorkLocalServiceImpl.java @@ -14,16 +14,6 @@ package org.opencps.usermgt.service.impl; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; - -import org.opencps.backend.usermgt.service.util.ConfigConstants; -import org.opencps.usermgt.constants.JobPosTerm; -import org.opencps.usermgt.constants.JobPosWorkTerm; -import org.opencps.usermgt.model.JobPosWork; -import org.opencps.usermgt.service.base.JobPosWorkLocalServiceBaseImpl; - import com.liferay.petra.string.StringPool; import com.liferay.portal.kernel.exception.NoSuchUserException; import com.liferay.portal.kernel.model.User; @@ -49,6 +39,8 @@ import java.util.LinkedHashMap; import java.util.List; +import org.opencps.backend.usermgt.service.util.ConfigConstants; +import org.opencps.usermgt.constants.JobPosTerm; import org.opencps.usermgt.constants.JobPosWorkTerm; import org.opencps.usermgt.model.JobPosWork; import org.opencps.usermgt.service.base.JobPosWorkLocalServiceBaseImpl; diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/OfficeSiteLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/OfficeSiteLocalServiceImpl.java index 9303687a5c..2ff88fbbaa 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/OfficeSiteLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/OfficeSiteLocalServiceImpl.java @@ -14,15 +14,6 @@ package org.opencps.usermgt.service.impl; -import java.util.Date; -import java.util.LinkedHashMap; - -import org.opencps.backend.usermgt.service.util.ConfigConstants; -import org.opencps.usermgt.constants.OfficeSiteTerm; -import org.opencps.usermgt.exception.NoSuchOfficeSiteException; -import org.opencps.usermgt.model.OfficeSite; -import org.opencps.usermgt.service.base.OfficeSiteLocalServiceBaseImpl; - import com.liferay.counter.kernel.service.CounterLocalServiceUtil; import com.liferay.petra.string.StringPool; import com.liferay.portal.kernel.exception.NoSuchUserException; @@ -51,6 +42,7 @@ import java.util.Date; import java.util.LinkedHashMap; +import org.opencps.backend.usermgt.service.util.ConfigConstants; import org.opencps.usermgt.constants.OfficeSiteTerm; import org.opencps.usermgt.exception.NoSuchOfficeSiteException; import org.opencps.usermgt.model.OfficeSite; diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/PreferencesLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/PreferencesLocalServiceImpl.java index b96c45c192..108cfc82f6 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/PreferencesLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/PreferencesLocalServiceImpl.java @@ -14,12 +14,6 @@ package org.opencps.usermgt.service.impl; -import java.util.Date; - -import org.opencps.auth.api.BackendAuthImpl; -import org.opencps.usermgt.model.Preferences; -import org.opencps.usermgt.service.base.PreferencesLocalServiceBaseImpl; - import com.liferay.asset.kernel.exception.DuplicateCategoryException; import com.liferay.counter.kernel.service.CounterLocalServiceUtil; import com.liferay.portal.kernel.exception.NoSuchUserException; @@ -44,8 +38,6 @@ import backend.auth.api.exception.NotFoundException; import backend.auth.api.exception.UnauthenticationException; import backend.auth.api.exception.UnauthorizationException; -import backend.auth.api.keys.ActionKeys; -import backend.auth.api.keys.ModelNameKeys; /** * The implementation of the preferences local service.

All custom service diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ResourceRoleLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ResourceRoleLocalServiceImpl.java index e4e19c3748..03db030aff 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ResourceRoleLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ResourceRoleLocalServiceImpl.java @@ -14,16 +14,6 @@ package org.opencps.usermgt.service.impl; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; - -import org.opencps.backend.usermgt.service.util.ConfigConstants; -import org.opencps.usermgt.constants.ResourceRoleTerm; -import org.opencps.usermgt.exception.NoSuchResourceRoleException; -import org.opencps.usermgt.model.ResourceRole; -import org.opencps.usermgt.service.base.ResourceRoleLocalServiceBaseImpl; - import com.liferay.counter.kernel.service.CounterLocalServiceUtil; import com.liferay.petra.string.StringPool; import com.liferay.portal.kernel.exception.NoSuchUserException; @@ -55,6 +45,7 @@ import java.util.LinkedHashMap; import java.util.List; +import org.opencps.backend.usermgt.service.util.ConfigConstants; import org.opencps.usermgt.constants.ResourceRoleTerm; import org.opencps.usermgt.exception.NoSuchResourceRoleException; import org.opencps.usermgt.model.ResourceRole; @@ -265,7 +256,7 @@ public Hits luceneSearchEngine(LinkedHashMap params, Sort[] sort searchContext.addFullQueryEntryClassName(ResourceRole.class.getName()); searchContext.setEntryClassNames(new String[] { ResourceRole.class.getName() }); - searchContext.setAttribute("paginationType", "regular"); + searchContext.setAttribute(ResourceRoleTerm.PAGINATION_TYPE, ResourceRoleTerm.REGULAR); searchContext.setLike(true); searchContext.setStart(start); searchContext.setEnd(end); diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ResourceUserLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ResourceUserLocalServiceImpl.java index 91921510d8..ecc817f5c1 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ResourceUserLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/ResourceUserLocalServiceImpl.java @@ -14,16 +14,6 @@ package org.opencps.usermgt.service.impl; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; - -import org.opencps.backend.usermgt.service.util.ConfigConstants; -import org.opencps.usermgt.constants.ResourceUserTerm; -import org.opencps.usermgt.exception.NoSuchResourceUserException; -import org.opencps.usermgt.model.ResourceUser; -import org.opencps.usermgt.service.base.ResourceUserLocalServiceBaseImpl; - import com.liferay.counter.kernel.service.CounterLocalServiceUtil; import com.liferay.petra.string.StringPool; import com.liferay.portal.kernel.exception.NoSuchUserException; @@ -53,6 +43,7 @@ import java.util.LinkedHashMap; import java.util.List; +import org.opencps.backend.usermgt.service.util.ConfigConstants; import org.opencps.usermgt.constants.ResourceUserTerm; import org.opencps.usermgt.exception.NoSuchResourceUserException; import org.opencps.usermgt.model.ResourceUser; @@ -439,9 +430,9 @@ public ResourceUser adminProcessData(JSONObject objectData) { ResourceUser object = null; - if (objectData.getLong("resourceUserId") > 0) { + if (objectData.getLong(ResourceUserTerm.RESOURCEUSER_ID) > 0) { - object = resourceUserPersistence.fetchByPrimaryKey(objectData.getLong("resourceUserId")); + object = resourceUserPersistence.fetchByPrimaryKey(objectData.getLong(ResourceUserTerm.RESOURCEUSER_ID)); object.setModifiedDate(new Date()); diff --git a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/WorkingUnitLocalServiceImpl.java b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/WorkingUnitLocalServiceImpl.java index 594f46702c..6bea5e6680 100644 --- a/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/WorkingUnitLocalServiceImpl.java +++ b/modules/backend-usermgt/backend-usermgt-service/src/main/java/org/opencps/usermgt/service/impl/WorkingUnitLocalServiceImpl.java @@ -14,18 +14,6 @@ package org.opencps.usermgt.service.impl; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; - -import org.opencps.backend.usermgt.service.util.ConfigConstants; -import org.opencps.usermgt.constants.CommonTerm; -import org.opencps.usermgt.constants.WorkingUnitTerm; -import org.opencps.usermgt.exception.NoSuchWorkingUnitException; -import org.opencps.usermgt.model.EmployeeJobPos; -import org.opencps.usermgt.model.WorkingUnit; -import org.opencps.usermgt.service.base.WorkingUnitLocalServiceBaseImpl; - import com.liferay.asset.kernel.exception.DuplicateCategoryException; import com.liferay.counter.kernel.service.CounterLocalServiceUtil; import com.liferay.petra.string.StringPool; @@ -57,6 +45,7 @@ import java.util.LinkedHashMap; import java.util.List; +import org.opencps.backend.usermgt.service.util.ConfigConstants; import org.opencps.usermgt.constants.CommonTerm; import org.opencps.usermgt.constants.WorkingUnitTerm; import org.opencps.usermgt.exception.NoSuchWorkingUnitException;