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

feat(REQ-3714): 处理pom依赖

Browse Source
This commit is contained in:
zhanghonghao 2025-03-10 13:42:50 +08:00
parent 0cbf35f1be
commit d2433d7fa2
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/project/worker/entity/OrgProjectWorker.java
View File

@ -1,6 +1,8 @@
package cn.axzo.orgmanax.infra.dao.project.worker.entity; package cn.axzo.orgmanax.infra.dao.project.worker.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -27,8 +29,9 @@ public class OrgProjectWorker implements Serializable {
private static final long serialVersionUID = 260206461965825922L; private static final long serialVersionUID = 260206461965825922L;
@TableId(
@TableField("id") type = IdType.AUTO
)
private Long id; private Long id;
/** /**

8
orgmanax-server/pom.xml
View File

@ -50,9 +50,9 @@
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId> <artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.baomidou</groupId> <!-- <groupId>com.baomidou</groupId>-->
<artifactId>lock4j-redisson-spring-boot-starter</artifactId> <!-- <artifactId>lock4j-redisson-spring-boot-starter</artifactId>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>
</project> </project>

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java
View File

@ -168,7 +168,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
nodeUserReq.setTopNodeIds(topNodeIds); nodeUserReq.setTopNodeIds(topNodeIds);
nodeUserReq.setPersonIds(personIds); nodeUserReq.setPersonIds(personIds);
List<NodeUserDTO> nodeUserDTOS = nodeUserService.list(nodeUserReq); List<NodeUserDTO> nodeUserDTOS = nodeUserService.list(nodeUserReq);
Map<Long, Long> personNodeMap = nodeUserDTOS.stream().collect(Collectors.toMap(NodeUserDTO::getPersonId, NodeUserDTO::getTopNodeId)); Map<Long, Long> personNodeMap = nodeUserDTOS.stream().collect(Collectors.toMap(NodeUserDTO::getPersonId, NodeUserDTO::getTopNodeId, (v1, v2) -> v2));
Set<Long> shipNodeIds = result.stream().map(OrgCooperateShipDTO::getOrganizationalNodeId).collect(Collectors.toSet()); Set<Long> shipNodeIds = result.stream().map(OrgCooperateShipDTO::getOrganizationalNodeId).collect(Collectors.toSet());
for (Map.Entry<Long, Long> entry : personNodeMap.entrySet()) { for (Map.Entry<Long, Long> entry : personNodeMap.entrySet()) {
if (shipNodeIds.contains(entry.getValue())) { if (shipNodeIds.contains(entry.getValue())) {

10
pom.xml
View File

@ -82,11 +82,11 @@
<artifactId>rocketmq-spring-boot-starter</artifactId> <artifactId>rocketmq-spring-boot-starter</artifactId>
<version>${rocket-mq.version}</version> <version>${rocket-mq.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.baomidou</groupId> <!-- <groupId>com.baomidou</groupId>-->
<artifactId>lock4j-redisson-spring-boot-starter</artifactId> <!-- <artifactId>lock4j-redisson-spring-boot-starter</artifactId>-->
<version>${redisson.version}</version> <!-- <version>${redisson.version}</version>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>