From b7da90fb97a477430ed3beaabd9066b19b1bf96e Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 15 Nov 2024 17:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=AF=BC=E5=87=BA=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/IBasicdataWarehouseClient.java      |  2 +
 .../mapper/AftersalesWorkOrderMapper.xml      |  6 +--
 .../impl/AftersalesWorkOrderServiceImpl.java  | 37 ++++++++++++++-----
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java
index 66b552b3e..d6acbf812 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java
@@ -122,6 +122,8 @@ public interface IBasicdataWarehouseClient {
 	@GetMapping(API_PREFIX + "/getWarehouseIds")
 	List<Long> getWarehouseIds();
 
+
+
 	/**
 	 * 获取当前登录人的能查看的仓库
 	 *
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index 3815ee635..2d89f589a 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -1047,6 +1047,7 @@
     <select id="getBasicExportData" resultType="com.logpm.aftersales.vo.AftersalesWorkOrderVO">
         SELECT DISTINCT
         lawo.id,
+        lawo.warehouse_name AS warehouseName,
         CASE
         lawo.work_order_type
         WHEN 1 THEN
@@ -1101,13 +1102,12 @@
         WHEN '100' THEN '申述中'
         WHEN '110' THEN '已结束' ELSE '未知状态'
         END workOrderStatusName,
-        lawo.processed_by,
-        GROUP_CONCAT(DISTINCT laprr.business_name) AS businessName,
+        lawo.processed_by AS businessName,
+<!--        GROUP_CONCAT(DISTINCT lap.business_name) AS businessName,-->
         lawo.create_time,
         (lawo.create_time + INTERVAL 2 DAY) AS endCreateTime,
         lawo.update_time,
         GROUP_CONCAT(DISTINCT lapr.result_type) AS resultTypes,
-        IFNULL( sum( lapr.money ), 0 ) AS totalAmountNum,
         lawo.ceator,
         lawo.compensation_money totalAmountNum,
         IF(lawo.work_order_status = '80',lawo.update_time,'') AS completeTime,
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index d0ce4091f..a4dc46c25 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -950,12 +950,19 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		//进行仓库限制
 		List<Long> warehouseIds = new ArrayList<>();
 		if (!Objects.isNull(myCurrentWarehouse)){
-			warehouseIds.add(myCurrentWarehouse.getId());
+			if (myCurrentWarehouse.getName().equals("职能中心仓")){
+				List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
+				if (!warehouseList.isEmpty()) {
+					warehouseIds.addAll(warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()));
+				}
+			}else {
+				warehouseIds.add(myCurrentWarehouse.getId());
+			}
 		}else {
 			//获取当前人所有仓权限信息
-			List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
-			if (!warehouseList.isEmpty()) {
-				warehouseIds.addAll(warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()));
+			List<Long> warehouseIds1 = warehouseClient.getWarehouseIds();
+			if (!warehouseIds1.isEmpty()) {
+				warehouseIds.addAll(warehouseIds1);
 			}
 		}
 		if (warehouseIds.isEmpty()) {
@@ -1709,6 +1716,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean savaSurveyRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO) {
+		boolean b = this.judgeIsCustomerService(AuthUtil.getUser());
+		if (!b){
+			throw new ServiceException("当前登录人无恢复权限!!!");
+		}
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		BladeUser user = AuthUtil.getUser();
 		//查询处理方信息
@@ -1896,7 +1907,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		if (!roleNames.getData().isEmpty()) {
 			boolean contains = roleNames.getData().contains("仓库客服");
 			if (!contains){
-				throw new ServiceException("当前登录人无仓库客服权限,请联系管理员！");
+				throw new ServiceException("当前登录人无操作权限");
 			}
 		}
 		//查询异常工单完结接口
@@ -2759,15 +2770,23 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		}else {
 			throw new CustomerException("当前登录人无工单操作权限!!!");
 		}
+//进行仓库限制
 //进行仓库限制
 		List<Long> warehouseIds = new ArrayList<>();
 		if (!Objects.isNull(myCurrentWarehouse)){
-			warehouseIds.add(myCurrentWarehouse.getId());
+			if (myCurrentWarehouse.getName().equals("职能中心仓")){
+				List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
+				if (!warehouseList.isEmpty()) {
+					warehouseIds.addAll(warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()));
+				}
+			}else {
+				warehouseIds.add(myCurrentWarehouse.getId());
+			}
 		}else {
 			//获取当前人所有仓权限信息
-			List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
-			if (!warehouseList.isEmpty()) {
-				warehouseIds.addAll(warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()));
+			List<Long> warehouseIds1 = warehouseClient.getWarehouseIds();
+			if (!warehouseIds1.isEmpty()) {
+				warehouseIds.addAll(warehouseIds1);
 			}
 		}
 		if (warehouseIds.isEmpty()) {