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 @@
org.springframework.cloud
spring-cloud-starter-bootstrap
-
- com.baomidou
- lock4j-redisson-spring-boot-starter
-
+
+
+
+
\ 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 nodeUserDTOS = nodeUserService.list(nodeUserReq);
- Map personNodeMap = nodeUserDTOS.stream().collect(Collectors.toMap(NodeUserDTO::getPersonId, NodeUserDTO::getTopNodeId));
+ Map personNodeMap = nodeUserDTOS.stream().collect(Collectors.toMap(NodeUserDTO::getPersonId, NodeUserDTO::getTopNodeId, (v1, v2) -> v2));
Set shipNodeIds = result.stream().map(OrgCooperateShipDTO::getOrganizationalNodeId).collect(Collectors.toSet());
for (Map.Entry 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 @@
rocketmq-spring-boot-starter
${rocket-mq.version}
-
- com.baomidou
- lock4j-redisson-spring-boot-starter
- ${redisson.version}
-
+
+
+
+
+