From 86a1886ba88e47995165cf85d79f9b8473ab4465 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 22 Feb 2024 10:54:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/supervise/vo/IndicatorsVO.java  |  3 ++-
 .../service/impl/ClassifyServiceImpl.java     | 17 +++++++-------
 .../service/impl/IndicatorsServiceImpl.java   |  9 ++++++++
 .../impl/TrunklineCarsLoadServiceImpl.java    | 23 +++++++++++--------
 4 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
index 3b2bdf5d6..f6d120129 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
@@ -2,7 +2,6 @@ package com.logpm.supervise.vo;
 
 import com.logpm.supervise.entity.IndicatorsAnnexEntity;
 import com.logpm.supervise.entity.IndicatorsEntity;
-import com.logpm.supervise.entity.PointsEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -37,4 +36,6 @@ public class IndicatorsVO extends IndicatorsEntity {
 
 	private List<IndicatorsAnnexEntity> files = new ArrayList<>();
 
+	private Integer isEdit;
+
 }
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
index d80bd4777..d594ef894 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
@@ -124,15 +124,16 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 			Long deptId = record.getCreateDept();
 			String deptName = deptClient.findNameById(deptId);
 			record.setCreateDeptName(deptName);
-			if (!"1".equals(isPid)) {
-				String ancestors = deptClient.getAncestorsByDeptId(deptId);
-				boolean contains = ancestors.contains(loginDeptId);
-				if(contains){
-					record.setIsEdit(1);
-				}else{
-					record.setIsEdit(0);
-				}
 
+			String ancestors = deptClient.getAncestorsByDeptId(deptId);
+			boolean contains = ancestors.contains(loginDeptId);
+			if(contains){
+				record.setIsEdit(1);
+			}else{
+				record.setIsEdit(0);
+			}
+
+			if (!"1".equals(isPid)) {
 				Long classifyId = record.getId();
 				Long pId1 = record.getPId();
 				ClassifyEntity classifyEntity = getById(pId1);
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
index 96a0c125e..bbc86cff2 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
@@ -14,6 +14,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDeptClient;
@@ -58,10 +59,18 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 
 		List<IndicatorsVO> records = pages.getRecords();
 
+		Long userId = AuthUtil.getUserId();
+
 		for (IndicatorsVO record : records) {
 			Long deptId = record.getCreateDept();
 			String deptName = deptClient.findNameById(deptId);
 			record.setCreateDeptName(deptName);
+			Long createUser = record.getCreateUser();
+			if(userId.equals(createUser)){
+				record.setIsEdit(1);
+			}else{
+				record.setIsEdit(0);
+			}
 		}
 		pages.setRecords(records);
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 556d5af42..272c18f97 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -943,20 +943,25 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String endWarehouseIds = loadEntity.getEndWarehouseIds();
 		String allWarehouseIds = startWarehouseId+","+endWarehouseIds;
 
+		String loadType1 = loadEntity.getLoadType();
+
 		Long nowWarehouseId = loadEntity.getNowWarehouseId();
 		if(!nowWarehouseId.equals(warehouseId)){
 			log.warn("###############selectEditDetailByLoadId: 配载计划不在当前节点 nowWarehouseId={} warehouseId={}",nowWarehouseId,warehouseId);
 			return R.fail(405,"配载计划不在当前节点");
 		}
-		TrunklineCarsLoadLineEntity endCarsLoadLineEntity = trunklineCarsLoadLineService.findEndNodeByLoadId(loadId);
-		if(Objects.isNull(endCarsLoadLineEntity)){
-			log.warn("###############selectEditDetailByLoadId: 终点节点信息不存在 loadId={}",loadId);
-			return R.fail(405,"终点节点信息不存在");
-		}
-		Long endNodeId = endCarsLoadLineEntity.getNodeId();
-		if(endNodeId.equals(warehouseId)){
-			log.warn("###############selectEditDetailByLoadId: 终点节点不能编辑配载 loadId={}",loadId);
-			return R.fail(405,"终点节点不能编辑配载");
+
+		if(!"4".equals(loadType1)){
+			TrunklineCarsLoadLineEntity endCarsLoadLineEntity = trunklineCarsLoadLineService.findEndNodeByLoadId(loadId);
+			if(Objects.isNull(endCarsLoadLineEntity)){
+				log.warn("###############selectEditDetailByLoadId: 终点节点信息不存在 loadId={}",loadId);
+				return R.fail(405,"终点节点信息不存在");
+			}
+			Long endNodeId = endCarsLoadLineEntity.getNodeId();
+			if(endNodeId.equals(warehouseId)){
+				log.warn("###############selectEditDetailByLoadId: 终点节点不能编辑配载 loadId={}",loadId);
+				return R.fail(405,"终点节点不能编辑配载");
+			}
 		}
 
 		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);