From d2433d7fa2067c5b14b50848e14c929ec8cb0932 Mon Sep 17 00:00:00 2001
From: zhanghonghao <zhanghonghao@axzo.cn>
Date: Mon, 10 Mar 2025 13:42:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3714):=20=E5=A4=84=E7=90=86pom?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/project/worker/entity/OrgProjectWorker.java    |  7 +++++--
 orgmanax-server/pom.xml                                |  8 ++++----
 .../service/impl/NodeUserCheckServiceImpl.java         |  2 +-
 pom.xml                                                | 10 +++++-----
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/project/worker/entity/OrgProjectWorker.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/project/worker/entity/OrgProjectWorker.java
index 48fbbd9..bd4ad50 100644
--- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/project/worker/entity/OrgProjectWorker.java
+++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/project/worker/entity/OrgProjectWorker.java
@@ -1,6 +1,8 @@
 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.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -27,8 +29,9 @@ public class OrgProjectWorker implements Serializable {
 
     private static final long serialVersionUID = 260206461965825922L;
 
-
-    @TableField("id")
+    @TableId(
+            type = IdType.AUTO
+    )
     private Long id;
 
     /**
diff --git a/orgmanax-server/pom.xml b/orgmanax-server/pom.xml
index ad5bb74..bfdf316 100644
--- a/orgmanax-server/pom.xml
+++ b/orgmanax-server/pom.xml
@@ -50,9 +50,9 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>lock4j-redisson-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java
index 00dbc6c..6a9fa41 100644
--- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java
+++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java
@@ -168,7 +168,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
         nodeUserReq.setTopNodeIds(topNodeIds);
         nodeUserReq.setPersonIds(personIds);
         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());
         for (Map.Entry<Long, Long> entry : personNodeMap.entrySet()) {
             if (shipNodeIds.contains(entry.getValue())) {
diff --git a/pom.xml b/pom.xml
index fac5dd9..fd7323d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,11 +82,11 @@
         <artifactId>rocketmq-spring-boot-starter</artifactId>
         <version>${rocket-mq.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.baomidou</groupId>
-        <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
-        <version>${redisson.version}</version>
-      </dependency>
+<!--      <dependency>-->
+<!--        <groupId>com.baomidou</groupId>-->
+<!--        <artifactId>lock4j-redisson-spring-boot-starter</artifactId>-->
+<!--        <version>${redisson.version}</version>-->
+<!--      </dependency>-->
     </dependencies>
   </dependencyManagement>
   <dependencies>