wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:[REQ-3488] 自测, 解决json查询报错问题

Browse Source
This commit is contained in:
liuyang 2025-01-13 17:07:41 +08:00
parent 69d52a8e18
commit 2497d7d77c
4 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java
View File

@ -12,6 +12,7 @@ import lombok.experimental.SuperBuilder;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@EqualsAndHashCode(callSuper = true)

15
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/service/impl/CooperateShipServiceImpl.java
View File

@ -5,42 +5,35 @@ import cn.axzo.apollo.workspace.api.v2.workspace.resp.WorkspaceDetailResp;
import cn.axzo.foundation.event.support.Event;
import cn.axzo.foundation.event.support.producer.EventProducer;
import cn.axzo.foundation.exception.Axssert;
import cn.axzo.orgmanax.dto.cooperateship.req.CreateOrgCooperateShipReq;
import cn.axzo.orgmanax.dto.cooperateship.req.ListOrgCooperateShipReq;
import cn.axzo.orgmanax.common.config.BizResultCode;
import cn.axzo.orgmanax.dto.cooperateship.dto.OrgCooperateShipDTO;
import cn.axzo.orgmanax.dto.cooperateship.enums.CooperateShipStatusEnum;
import cn.axzo.orgmanax.dto.cooperateship.enums.CooperateShipTypeEnum;
import cn.axzo.orgmanax.dto.cooperateship.dto.OrgCooperateShipDTO;
import cn.axzo.orgmanax.common.config.BizResultCode;
import cn.axzo.orgmanax.dto.cooperateship.req.UpdateOrgCooperateShipReq;
import cn.axzo.orgmanax.dto.cooperateship.req.CreateOrgCooperateShipReq;
import cn.axzo.orgmanax.dto.cooperateship.req.ListOrgCooperateShipReq;
import cn.axzo.orgmanax.infra.client.workspace.WorkspaceGateway;
import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
import cn.axzo.orgmanax.infra.dao.cooperateship.repository.CooperateShipQueryRepository;
import cn.axzo.orgmanax.infra.dao.cooperateship.repository.CooperateShipUpsertRepository;
import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode;
import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository;
import cn.axzo.orgmanax.infra.dao.unit.repository.UnitQueryRepository;
import cn.axzo.orgmanax.server.cooperateship.event.inner.CooperateShipEventType;
import cn.axzo.orgmanax.server.cooperateship.event.inner.payload.CoopeateShipUpsertedPayload;
import cn.axzo.orgmanax.server.cooperateship.foundation.CooperateShipFoundationService;
import cn.axzo.orgmanax.server.cooperateship.service.CooperateShipService;
import cn.axzo.orgmanax.server.orgjob.foundation.OrgJobFoundationService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.google.common.collect.ImmutableSet;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionTemplate;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@Service

16
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/executor/ListNodeCmdExe.java
View File

@ -124,7 +124,7 @@ public class ListNodeCmdExe {
// 平台班组id
if (CollUtil.isNotEmpty(req.getPlatTeamIds())) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
Collections.singletonList(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.platTeamId")
.operator(Operator.IN)
.data(req.getPlatTeamIds())
@ -133,7 +133,7 @@ public class ListNodeCmdExe {
// 项目内班组ID
if (CollUtil.isNotEmpty(req.getProjectTeamIds())) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
Collections.singletonList(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.projectTeamId")
.operator(Operator.IN)
.data(req.getProjectTeamIds())
@ -143,7 +143,7 @@ public class ListNodeCmdExe {
// 项目内小组类型
if (req.getProjectGroupType() != null) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
Collections.singletonList(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.type")
.data(req.getProjectGroupType())
.build())));
@ -152,7 +152,7 @@ public class ListNodeCmdExe {
// 项目内小组ID
if (CollUtil.isNotEmpty(req.getProjectGroupIds())) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
Collections.singletonList(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.projectGroupId")
.operator(Operator.IN)
.data(req.getProjectGroupIds())
@ -162,7 +162,7 @@ public class ListNodeCmdExe {
// 小组长工人身份id
if (CollUtil.isNotEmpty(req.getOwnerWorkerIdentityIds())) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
Collections.singletonList(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.ownerWorkerIdentityId")
.operator(Operator.IN)
.data(req.getOwnerWorkerIdentityIds())
@ -172,16 +172,16 @@ public class ListNodeCmdExe {
// 项目内小组状态
if (req.getProjectGroupStatus() != null) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
Collections.singletonList(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.status")
.data(req.getProjectGroupStatus())
.build())));
}
// 项目内小组状态
if (req.getOwnerProjectWorkerIds() != null) {
if (CollUtil.isNotEmpty(req.getOwnerProjectWorkerIds())) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
Collections.singletonList(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.ownerProjectWorkerId")
.operator(Operator.IN)
.data(req.getOwnerProjectWorkerIds())

14
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserServiceImpl.java
View File

@ -210,7 +210,7 @@ public class NodeUserServiceImpl implements NodeUserService {
// projectWorkerStatuses
if (CollUtil.isNotEmpty(req.getProjectWorkerStatuses())) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
ImmutableList.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.projectWorkerStatus")
.operator(Operator.IN)
.data(req.getProjectWorkerStatuses())
@ -219,7 +219,7 @@ public class NodeUserServiceImpl implements NodeUserService {
// platTeamId
if (req.getPlatTeamId() != null) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
ImmutableList.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.platTeamId")
.data(req.getPlatTeamId())
.build())));
@ -227,7 +227,7 @@ public class NodeUserServiceImpl implements NodeUserService {
// projectTeamIds
if (CollUtil.isNotEmpty(req.getProjectTeamIds())) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
ImmutableList.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.projectTeamId")
.operator(Operator.IN)
.data(req.getProjectTeamIds())
@ -236,7 +236,7 @@ public class NodeUserServiceImpl implements NodeUserService {
// projectTeamId
if (req.getProjectTeamId() != null) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
ImmutableList.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.projectTeamId")
.data(req.getProjectTeamId())
.build())));
@ -244,7 +244,7 @@ public class NodeUserServiceImpl implements NodeUserService {
// projectWorkerIds
if (CollUtil.isNotEmpty(req.getProjectWorkerIds())) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
ImmutableList.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.projectWorkerId")
.operator(Operator.IN)
.data(req.getProjectWorkerIds())
@ -253,7 +253,7 @@ public class NodeUserServiceImpl implements NodeUserService {
// projectWorkerId
if (req.getProjectWorkerId() != null) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
ImmutableList.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.projectWorkerId")
.data(req.getProjectWorkerId())
.build())));
@ -261,7 +261,7 @@ public class NodeUserServiceImpl implements NodeUserService {
// projectGroupId
if (req.getProjectGroupId() != null) {
listReq.setProfileQueries(QueryConditionAssembler.assemble(listReq.getProfileQueries(),
ImmutableSet.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
ImmutableList.of(MybatisPlusOperatorProcessor.JSONQuery.builder()
.jsonPath("$.projectGroupId")
.data(req.getProjectGroupId())
.build())));