From 00e8c3f4a239031ef5b91333ffa7d20c6a80b67f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 三月 2025 16:13:29 +0800
Subject: [PATCH] 问题处理单模板调整

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
index e6958bc..40e393c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -31,6 +31,7 @@
 import com.panzhihua.sangeshenbian.warpper.IdentityInformation;
 import com.panzhihua.sangeshenbian.warpper.MgtComplaintQuery;
 import com.panzhihua.sangeshenbian.warpper.PermissionsVO;
+import jodd.util.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
@@ -1174,7 +1175,9 @@
             case 2:
                 fileName = "question_handle.docx";
                 if (Objects.nonNull(partyMember)) {
-                    community = community + "-" + partyMember.getServiceTarget();
+                    if (StringUtil.isNotBlank(partyMember.getServiceTarget())) {
+                        community = community + "-" + partyMember.getServiceTarget();
+                    }
                 }
                 reportType = complaint.getCompletionUserLevel();
                 break;
@@ -1196,7 +1199,9 @@
         map.put("problemType", complaint.getProblemType());
         map.put("descriptionContent", complaint.getDescriptionContent());
         map.put("reportType", reportType == null ? "" : ReportTypeEnum.getDescriptionByCode(reportType));
-        map.put("partyOrganization", Objects.nonNull(partyMember) ? partyMember.getPartyOrganization() : "");
+        if (Objects.nonNull(partyMember)) {
+            map.put("partyOrganization", StringUtil.isNotBlank(partyMember.getPartyOrganization()) ? partyMember.getPartyOrganization() : "");
+        }
         map.put("name", complaint.getName());
         map.put("contactNumber", complaint.getContactNumber());
         map.put("nickname", complaint.getReportUserName());

--
Gitblit v1.7.1