wangli/axzo-log-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release-20241030' into 'master'

Browse Source 
Release 20241030

See merge request universal/infrastructure/backend/axzo-log-plat!136
This commit is contained in:
zhangyinlin 2024-10-30 08:40:53 +00:00
commit a06ac5fb55
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
axzo-log-server/pom.xml
View File

@ -109,9 +109,14 @@
</dependency>
<dependency>
<groupId>cn.axzo.maokai</groupId>
<artifactId>maokai-api</artifactId>
</dependency>
<!-- <dependency>
<groupId>cn.axzo.basics</groupId>
<artifactId>basics-organizational-api</artifactId>
</dependency>
</dependency>-->
<dependency>
<groupId>cn.axzo.apollo</groupId>

7
axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/OperateLogServiceImpl.java
View File

@ -4,8 +4,9 @@ import cn.axzo.apollo.core.web.Result;
import cn.axzo.apollo.workspace.api.workspace.WorkspaceApi;
import cn.axzo.apollo.workspace.api.workspace.req.GetDetailReq;
import cn.axzo.apollo.workspace.api.workspace.res.GetDetailRes;
import cn.axzo.basics.organizational.api.OrganizationalUnitApi;
import cn.axzo.basics.organizational.api.vo.response.OrganizationalUnitVO;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.maokai.api.client.OrganizationalUnitApi;
import cn.axzo.maokai.api.vo.response.OrganizationalUnitVO;
import cn.axzo.basics.profiles.api.UserProfileServiceApi;
import cn.axzo.basics.profiles.common.enums.IdentityType;
import cn.axzo.basics.profiles.dto.basic.IdentityProfileDto;
@ -377,7 +378,7 @@ public class OperateLogServiceImpl extends BaseEsService implements OperateLogSe
* @return
*/
private OrganizationalUnitVO qryOrgUnitInf(Long ouId) throws ThirdApiException {
CommonResponse<OrganizationalUnitVO> response = organizationalUnitApi.getById(ouId);
ApiResult<OrganizationalUnitVO> response = organizationalUnitApi.getById(ouId);
if (response.getCode() != 200) {
throw new ThirdApiException(response.getMsg());
}