From ddcdd47582b6683779324c7fae9ff97b67612845 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 17 Apr 2026 21:24:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/GyzjTzServiceImpl.java   | 39 ++++++++++------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java
index 1d41cd7..0ca4b26 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java
@@ -61,30 +61,29 @@ public class GyzjTzServiceImpl extends ServiceImpl<GyzjTzMapper, GyzjTz> impleme
         if (lqr1 != null && lqr2 != null) {
             gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
             gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
-        }
-        else{
-            gyzjTz.setLqrMc(lqr1.getNickName());
+        }else  if (lqr1 != null) {
+            gyzjTz.setLqrMc(lqr1.getNickName() );
             gyzjTz.setLqrMcEn(lqr1.getUserName());
         }
 
         if (ghr1 != null && ghr2 != null) {
             gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName());
             gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName());
-        }else {
+        }else if (ghr1 != null) {
             gyzjTz.setGhrMc(ghr1.getNickName());
-            gyzjTz.setGhrMcEn(ghr1.getUserName());
+            gyzjTz.setGhrMcEn(ghr1.getUserName() );
         }
         if (ffr1 != null && ffr2 != null) {
             gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
             gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
-        }else{
+        }else if (ffr1 != null) {
             gyzjTz.setFfrMc(ffr1.getNickName());
             gyzjTz.setFfrMcEn(ffr1.getUserName());
         }
         if (jsr1 != null && jsr2 != null) {
             gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName());
             gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName());
-        }else{
+        }else if (jsr1 != null) {
             gyzjTz.setJsrMc(jsr1.getNickName());
             gyzjTz.setJsrMcEn(jsr1.getUserName() );
         }
@@ -124,30 +123,29 @@ public class GyzjTzServiceImpl extends ServiceImpl<GyzjTzMapper, GyzjTz> impleme
         if (lqr1 != null && lqr2 != null) {
             gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
             gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
-        }
-        else{
-            gyzjTz.setLqrMc(lqr1.getNickName());
+        }else  if (lqr1 != null) {
+            gyzjTz.setLqrMc(lqr1.getNickName() );
             gyzjTz.setLqrMcEn(lqr1.getUserName());
         }
 
         if (ghr1 != null && ghr2 != null) {
             gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName());
             gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName());
-        }else {
+        }else if (ghr1 != null) {
             gyzjTz.setGhrMc(ghr1.getNickName());
-            gyzjTz.setGhrMcEn(ghr1.getUserName());
+            gyzjTz.setGhrMcEn(ghr1.getUserName() );
         }
         if (ffr1 != null && ffr2 != null) {
             gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
             gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
-        }else{
+        }else if (ffr1 != null) {
             gyzjTz.setFfrMc(ffr1.getNickName());
             gyzjTz.setFfrMcEn(ffr1.getUserName());
         }
         if (jsr1 != null && jsr2 != null) {
             gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName());
             gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName());
-        }else{
+        }else if (jsr1 != null) {
             gyzjTz.setJsrMc(jsr1.getNickName());
             gyzjTz.setJsrMcEn(jsr1.getUserName() );
         }
@@ -189,30 +187,29 @@ public class GyzjTzServiceImpl extends ServiceImpl<GyzjTzMapper, GyzjTz> impleme
         if (lqr1 != null && lqr2 != null) {
             gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
             gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
-        }
-        else{
-            gyzjTz.setLqrMc(lqr1.getNickName());
+        }else  if (lqr1 != null) {
+            gyzjTz.setLqrMc(lqr1.getNickName() );
             gyzjTz.setLqrMcEn(lqr1.getUserName());
         }
 
         if (ghr1 != null && ghr2 != null) {
             gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName());
             gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName());
-        }else {
+        }else if (ghr1 != null) {
             gyzjTz.setGhrMc(ghr1.getNickName());
-            gyzjTz.setGhrMcEn(ghr1.getUserName());
+            gyzjTz.setGhrMcEn(ghr1.getUserName() );
         }
         if (ffr1 != null && ffr2 != null) {
             gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
             gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
-        }else{
+        }else if (ffr1 != null) {
             gyzjTz.setFfrMc(ffr1.getNickName());
             gyzjTz.setFfrMcEn(ffr1.getUserName());
         }
         if (jsr1 != null && jsr2 != null) {
             gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName());
             gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName());
-        }else{
+        }else if (jsr1 != null) {
             gyzjTz.setJsrMc(jsr1.getNickName());
             gyzjTz.setJsrMcEn(jsr1.getUserName() );
         }