From 38eeeecee2962c4f7828717d0abc1c9c7713a7e9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 29 Dec 2021 10:36:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E7=9A=84=E9=9C=80=E6=B1=82=EF=BC=8C=E6=8C=87=E6=B4=BE=E5=BF=97?=
 =?UTF-8?q?=E6=84=BF=E8=80=85=E6=97=B6=EF=BC=8C=E9=9C=80=E6=B1=82=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=8E=E6=9C=8D=E5=8A=A1=E6=96=B9=E4=B8=8D=E8=83=BD=E6=98=AF?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 17833fe7cb..45a1e6f1f8 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -373,6 +373,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             //待处理+已派单才可以指派
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("需求当前状态为【%s】,不可指派",entity.getStatus()),"当前状态,不可指派");
         }
+        if (UserDemandConstant.VOLUNTEER.equals(formDTO.getServiceType()) && formDTO.getServerId().equals(entity.getDemandUserId())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("居民端用户上报的需求【%s】,需求人与服务方（志愿者）不能同为一人", entity.getId()), "需求人与服务方不能同为一人");
+        }
         //1、修改主表
         //置为已派单
         entity.setStatus(UserDemandConstant.ASSIGNED);