From bf9630d84a594298dfa50a8646257a5ec37a299a Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 17 Apr 2026 20:42:07 +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

---
 .../java/com/hxhq/business/service/impl/GyzjServiceImpl.java   | 10 +++++++---
 .../main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java    |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
index 0e71134..d73de75 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
@@ -1236,11 +1236,13 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     @Transactional(rollbackFor = Exception.class)
     public void gh(GhForm form) {
         SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser();
-        SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id());
+        SysUser jsr2 =form.getJsr2Id()!=null? sysUserService.selectUserById(form.getJsr2Id()):null;
         //验证接收人1密码
         checkPassword(jsr1, form.getJsr1mm(), true,"接收人1");
         //验证接收人2密码
-        checkPassword(jsr2, form.getJsr2mm(), true,"接收人2");
+        if(jsr2!=null){
+            checkPassword(jsr2, form.getJsr2mm(), true,"接收人2");
+        }
 
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
@@ -1272,7 +1274,9 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         formData.put("入库净重", form.getRkl() + gyzjOld.getKcdw());
         formData.put("入库毛重", form.getRkmz() + form.getRkmzdw());
         formData.put("库管员1", jsr1.getNickName());
-        formData.put("库管员2", jsr2.getNickName());
+        if(jsr2!=null){
+            formData.put("库管员2", jsr2.getNickName());
+        }
         gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, jsr1, SecurityUtils.getNickName());
         //通知
         noticeService.save("给药制剂【" + gyzjOld.getMc() + "】确认归还", ghr1.getUserId(), getUrlQz("gyzjList"));
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java
index 9771daf..0cbe036 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java
@@ -21,6 +21,7 @@ public class MjyJcnrUtil {
         mapLang.put("入库","In Storage");
         mapLang.put("未入库","Not in Storage");
         mapLang.put("已发放","In Use");
+        mapLang.put("减少量","Reduction");
         mapLang.put("已锁定","Locked");
         mapLang.put("待归档","Pending Archiving");
         mapLang.put("归档","Archived");