From 4aa82b78a8e3d3be6f76df0f428c7c285931f433 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 27 Jul 2021 13:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E6=9C=89=E4=B8=93=E9=A2=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/QuerySpecialSubFormDTO.java  | 4 ++++
 .../java/com/epmet/controller/SpecialSubjectController.java   | 1 +
 .../com/epmet/service/impl/SpecialSubjectServiceImpl.java     | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/QuerySpecialSubFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/QuerySpecialSubFormDTO.java
index fb43db39e6..2410d1fedd 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/QuerySpecialSubFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/QuerySpecialSubFormDTO.java
@@ -34,4 +34,8 @@ public class QuerySpecialSubFormDTO implements Serializable {
      * 当前登录用户userId,
      */
     private String userId;
+    /**
+     * 当前登录用户客户id
+     */
+    private String customerId;
 }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java
index a45d598709..017338b433 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java
@@ -95,6 +95,7 @@ public class SpecialSubjectController {
     @PostMapping("existedlist")
     public Result<List<WorkSpecialSubjectResultDTO>> queryExistedList(@LoginUser TokenDto tokenDto, @RequestBody QuerySpecialSubFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO, QuerySpecialSubFormDTO.AddUserInternalGroup.class);
         return new Result<List<WorkSpecialSubjectResultDTO>>().ok(specialSubjectService.queryExistedList(formDTO));
     }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java
index d5e76d5f84..aa5e70b4bf 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java
@@ -156,6 +156,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
         SpecialSubjectEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, SpecialSubjectEntity.class);
         StaffInfoFromDTO staffInfoFromDTO = new StaffInfoFromDTO();
         staffInfoFromDTO.setStaffId(formDTO.getAddUserId());
+        staffInfoFromDTO.setCustomerId(formDTO.getCustomerId());
         Result<MineResultDTO> result = govOrgOpenFeignClient.queryStaffProfile(staffInfoFromDTO);
         if(result.success()&&null!=result.getData()){
             insertEntity.setAddUserAgencyId(result.getData().getAgencyId());
@@ -200,6 +201,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
     public List<WorkSpecialSubjectResultDTO> queryExistedList(QuerySpecialSubFormDTO formDTO) {
         StaffInfoFromDTO staffInfoFromDTO = new StaffInfoFromDTO();
         staffInfoFromDTO.setStaffId(formDTO.getUserId());
+        staffInfoFromDTO.setCustomerId(formDTO.getCustomerId());
         Result<MineResultDTO> staffResult = govOrgOpenFeignClient.queryStaffProfile(staffInfoFromDTO);
         if (!staffResult.success() && null == staffResult.getData()) {
             throw new RenException("查询当前工作人员信息异常");