diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
index 1827268..d29f845 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
@@ -451,7 +451,9 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         formData.put("归还人1", ghr1.getNickName());
         formData.put("归还人2", ghr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
-        formData.put("库管员2", jsr2.getNickName());
+        if(jsr2!=null){
+            formData.put("库管员2", jsr2.getNickName());
+        }
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "归还");
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjl, JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
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 bca311b..1d41cd7 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
@@ -62,18 +62,31 @@ public class GyzjTzServiceImpl extends ServiceImpl<GyzjTzMapper, GyzjTz> impleme
             gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
             gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
         }
+        else{
+            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 {
+            gyzjTz.setGhrMc(ghr1.getNickName());
+            gyzjTz.setGhrMcEn(ghr1.getUserName());
         }
         if (ffr1 != null && ffr2 != null) {
             gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
             gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
+        }else{
+            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{
+            gyzjTz.setJsrMc(jsr1.getNickName());
+            gyzjTz.setJsrMcEn(jsr1.getUserName() );
         }
         if (qmr != null && qmr != null) {
             gyzjTz.setQmrId(qmr.getUserId());