From 71d0176d48492cdbbbc3f2d99c5f3f96dbffae81 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 24 Aug 2022 17:27:53 +0800
Subject: [PATCH 1/3] kehuId

---
 .../epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java
index 290a583e7e..b59d7658ff 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java
@@ -134,6 +134,7 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl<Workdiary
 
         if (applicant != null) {
             entity.setApplicantName(applicant.getName());
+            entity.setCustomerId(applicant.getCustomerId());
         }
         insert(entity);
     }

From 4497d1aba9fd0ab5325dfbfabd495fb4ce32f02e Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Thu, 25 Aug 2022 09:37:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E3=80=91=E6=96=B0=E5=A2=9E=E7=BC=BA=E5=A4=B1=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkdiaryServiceRecordServiceImpl.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java
index 290a583e7e..4547aa952a 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java
@@ -127,11 +127,15 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl<Workdiary
 
         // orgidPath
         Optional.ofNullable(CustomerOrgRedis.getGridInfo(dto.getGridId()))
-                .ifPresent(gi -> entity.setOrgIdPath(gi.getPids().concat(":").concat(gi.getId())));
+                .ifPresent(gi -> {
+                    entity.setOrgIdPath(gi.getPids().concat(":").concat(gi.getId()));
+                    entity.setAgencyId(gi.getPid());
+                });
 
         IcResiUserDTO applicant = getResultDataOrThrowsException(userOpenFeignClient.getIcResiUserDTO(dto.getApplicantId()), ServiceConstant.EPMET_USER_SERVER,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "未找到申请人信息");
 
+        entity.setCustomerId(EpmetRequestHolder.getLoginUserCustomerId());
         if (applicant != null) {
             entity.setApplicantName(applicant.getName());
         }

From cbbff32fb79887fb132a7f82badb40402e9f1795 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Thu, 25 Aug 2022 09:46:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E3=80=91update=E7=BC=BA=E5=A4=B1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkdiaryServiceRecordServiceImpl.java    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java
index 6e91f95877..ffd71c8489 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java
@@ -147,6 +147,26 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl<Workdiary
     @Transactional(rollbackFor = Exception.class)
     public void update(WorkdiaryServiceRecordDTO dto) {
         WorkdiaryServiceRecordEntity entity = ConvertUtils.sourceToTarget(dto, WorkdiaryServiceRecordEntity.class);
+
+        // orgidPath
+        if (StringUtils.isNotBlank(dto.getGridId())) {
+            Optional.ofNullable(CustomerOrgRedis.getGridInfo(dto.getGridId()))
+                    .ifPresent(gi -> {
+                        entity.setOrgIdPath(gi.getPids().concat(":").concat(gi.getId()));
+                        entity.setAgencyId(gi.getPid());
+                    });
+        }
+
+        if (StringUtils.isNotBlank(dto.getApplicantId())) {
+            IcResiUserDTO applicant = getResultDataOrThrowsException(userOpenFeignClient.getIcResiUserDTO(dto.getApplicantId()), ServiceConstant.EPMET_USER_SERVER,
+                    EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "未找到申请人信息");
+
+            if (applicant != null) {
+                entity.setApplicantName(applicant.getName());
+                entity.setCustomerId(applicant.getCustomerId());
+            }
+        }
+
         updateById(entity);
     }