treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Чтобы компилировалось.

Browse source
This commit is contained in:
AKurakin 2023-03-31 21:40:30 +03:00
parent 73757a3bdb
commit f99989145c
5 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
View file

@ -92,7 +92,7 @@ import static ru.spcex.clearing.backendapi.controller.utils.MatcherFactory.using
BankAccountController.class,
//company
CompanyRoleSetController.class,
DeleteCompanyController.class,
//fixme на 31.03.2023 нет такого класса DeleteCompanyController.class,
EditClearingMemberCategoryController.class,
EditCompanyInfoController.class,
EditCompanySymbolController.class,

2
clearing-parent/clearing-utils/pom.xml
View file

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>clearing-utils</artifactId>
<name>Clearing-module (classes, IMDG and other) dependency version of platform-utils</name>
<name>Clearing-module, dependency version of platform-utils</name>
<packaging>jar</packaging>
<version>SPCEX-1.0.0.0</version>

12
clearing-parent/company-service/pom.xml
View file

@ -28,6 +28,18 @@
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
</dependency>
<dependency>
<groupId>ru.spcex.platform</groupId>
<artifactId>platform-enum</artifactId>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>security-util</artifactId>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-utils</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>

6
clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java
View file

@ -58,15 +58,15 @@ public class UserRoleVerification {
}
boolean userHasRole(Long userId, IEnumKey role) {
public boolean userHasRole(Long userId, IEnumKey role) {
return userHasRole(userId, role == null ? null : role.getKey());
}
boolean userHasRole(Long userId, Long companyId, IEnumKey role) {
public boolean userHasRole(Long userId, Long companyId, IEnumKey role) {
return userHasRole(userId, companyId, role == null ? null : role.getKey());
}
boolean userHasRoleOnObject(Long userId, BusinessObject /*todo WithUserId / WithCompany */ bObject) {
public boolean userHasRoleOnObject(Long userId, BusinessObject /*todo WithUserId / WithCompany */ bObject) {
//todo impl
return true;
}

11
pom.xml
View file

@ -94,6 +94,17 @@
<version>${global.project.version}</version>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-utils</artifactId>
<version>${global.project.version}</version>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>security-util</artifactId>
<version>${global.project.version}</version>
</dependency>
<dependency>
<groupId>ru.spcex.platform</groupId>
<artifactId>platform-classes-base</artifactId>