From 5e3fb189ce687f0b8a9406ebfa4c4cdd8ad6236f Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Tue, 28 May 2024 18:08:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E7=94=B3=E8=BF=B0=E8=87=AA=E5=B7=B1=E7=9C=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E8=87=AA=E5=B7=B1=E7=9A=84=E5=8D=95=E5=AD=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/aftersales/dto/AftersalesAppealDTO.java    | 4 ++++
 .../com/logpm/aftersales/mapper/AftersalesAppealMapper.xml    | 4 +++-
 .../aftersales/service/impl/AftersalesAppealServiceImpl.java  | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAppealDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAppealDTO.java
index ae13ab355..d7ab92fe8 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAppealDTO.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAppealDTO.java
@@ -61,6 +61,10 @@ public class AftersalesAppealDTO extends AftersalesAppealEntity {
 	 * 标识 1 仓库  2 总部客服
 	 */
 	private String identifying;
+	/**
+	 * 标识 1 仓库  2 总部客服
+	 */
+	private Long createUserId;
 
 
 }
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml
index 04d16d8a6..025614d3f 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml
@@ -57,7 +57,9 @@
         LEFT JOIN logpm_aftersales_completion_record lacr on laa.work_order_id = lacr.work_order_id
         LEFT JOIN logpm_aftersales_work_order lawo ON lawo.id = lacr.work_order_id
         <where> laa.is_deleted = 0
-            <if test="param.warehouseId != null and param.warehouseId != '' "> and lacr.warehouse_id = #{param.warehouseId }  </if>
+            <if test="param.warehouseId != null and param.warehouseId != '' ">
+                and (lacr.warehouse_id = #{param.warehouseId } or laa.create_user = #{param.createUserId})
+            </if>
             <if test="param.appealPeopleName != null and param.appealPeopleName != ''">and laa.appeal_people_name  = #{param.appealPeopleName}</if>
             <if test="param.claimant != null and param.claimant != ''">and laa.claimant = #{param.claimant}</if>
             <if test="param.workOrderNumber != null and param.workOrderNumber != ''">and lawo.work_order_number  = #{param.workOrderNumber}</if>
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java
index 6325f0477..3d4c80f24 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java
@@ -163,7 +163,9 @@ public class AftersalesAppealServiceImpl extends BaseServiceImpl<AftersalesAppea
 		if(ObjectUtils.isNotNull(myCurrentWarehouse)){
 			aftersalesAppeal.put("warehouse_id",myCurrentWarehouse.getId());
 		}
+		Long userId = AuthUtil.getUserId();
 		AftersalesAppealDTO aftersalesAppealDTO = JSONObject.parseObject(JSONObject.toJSONString(aftersalesAppeal), AftersalesAppealDTO.class);
+		aftersalesAppealDTO.setCreateUserId(userId);
 		IPage<AftersalesAppealVO> iPage  = baseMapper.getListAppeal(page,aftersalesAppealDTO);
 		iPage.getRecords().forEach( i ->{
 			i.setWorkOrderTypeName(DictBizCache.getValue(DictBizConstant.PC_WORK_ORDER,i.getWorkOrderType()));