diff --git a/backend/src/main/java/ervu_business_metrics/dao/AccountDataDao.java b/backend/src/main/java/ervu_business_metrics/dao/AccountDataDao.java index aa9c83f..5dc80ad 100644 --- a/backend/src/main/java/ervu_business_metrics/dao/AccountDataDao.java +++ b/backend/src/main/java/ervu_business_metrics/dao/AccountDataDao.java @@ -22,10 +22,10 @@ public class AccountDataDao extends AbstractDataDao { } public List getAccountIdsByPersonId(String personId) { - return getValuesByField(ACCOUNT.ID, ACCOUNT.PERSON_ID, personId); + return getValuesByField(Tables.ACCOUNT.ID, Tables.ACCOUNT.PERSON_ID, personId); } - public void deleteByIds(List ids){ + public void deleteByIds(List ids) { deleteByFieldInValues(Tables.ACCOUNT.ID, ids); } diff --git a/backend/src/main/java/ervu_business_metrics/dao/AccountRoleDataDao.java b/backend/src/main/java/ervu_business_metrics/dao/AccountRoleDataDao.java index 1415788..a2e3bac 100644 --- a/backend/src/main/java/ervu_business_metrics/dao/AccountRoleDataDao.java +++ b/backend/src/main/java/ervu_business_metrics/dao/AccountRoleDataDao.java @@ -11,7 +11,6 @@ import org.springframework.stereotype.Component; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Tables; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountRoleRecord; -import static ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Tables.ACCOUNT_ROLE; /** * @author Adel Kalimullin @@ -24,24 +23,24 @@ public class AccountRoleDataDao extends AbstractDataDao { } public List getRoleIdsByAccountId(String accountId) { - return getValuesByField(ACCOUNT_ROLE.ROLE_ID, ACCOUNT_ROLE.ACCOUNT_ID, accountId); + return getValuesByField(Tables.ACCOUNT_ROLE.ROLE_ID, Tables.ACCOUNT_ROLE.ACCOUNT_ID, accountId); } public void deleteAccountRolesByAccountIdAndRoleIds(String accountId, List roleIds) { deleteByFieldAndInValues( - ACCOUNT_ROLE.ACCOUNT_ID, accountId, - ACCOUNT_ROLE.ROLE_ID, roleIds + Tables.ACCOUNT_ROLE.ACCOUNT_ID, accountId, + Tables.ACCOUNT_ROLE.ROLE_ID, roleIds ); } public void deleteByAccountIds(List accountIds) { - deleteByFieldInValues(ACCOUNT_ROLE.ACCOUNT_ID, accountIds); + deleteByFieldInValues(Tables.ACCOUNT_ROLE.ACCOUNT_ID, accountIds); } public void deleteAccountRole(AccountRoleRecord record) { Map, String> conditions = Map.of( - ACCOUNT_ROLE.ACCOUNT_ID, record.getAccountId(), - ACCOUNT_ROLE.ROLE_ID, record.getRoleId() + Tables.ACCOUNT_ROLE.ACCOUNT_ID, record.getAccountId(), + Tables.ACCOUNT_ROLE.ROLE_ID, record.getRoleId() ); deleteByValues(conditions);