From 36f7e1d87b7d3242bfea4c1a0b34a649e525d92d Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 29 Dec 2021 10:26:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/WorkActDraftController.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
index e960a2f926..9d018d7d81 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
@@ -1,5 +1,7 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.work.*;
@@ -82,8 +84,9 @@ public class WorkActDraftController {
      * @Date 2020/7/21 17:24 
      **/
     @PostMapping("preview")
-    public Result<ActPreviewResultDTO> previewActDetail(@RequestBody ActPreviewFormDTO formDTO){
+    public Result<ActPreviewResultDTO> previewActDetail(@LoginUser TokenDto tokenDto, @RequestBody ActPreviewFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,ActPreviewFormDTO.UserInternalGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ActPreviewResultDTO resultDTO=workActDraftService.previewActDetail(formDTO);
         return new Result<ActPreviewResultDTO>().ok(resultDTO);
     }

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 2/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E7=9A=84=E9=9C=80=E6=B1=82=EF=BC=8C=E6=8C=87=E6=B4=BE?=
 =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=97=B6=EF=BC=8C=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=8E=E6=9C=8D=E5=8A=A1=E6=96=B9=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=98=AF=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);