From 6b12992a3b2c9606d11080ac90908c4256ec049f Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 26 Jan 2026 16:59:31 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E7=89=A9=E8=B5=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86]bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/service/impl/GyzjServiceImpl.java | 18 +++++++++++++++++- .../com/hxhq/business/service/impl/MjyServiceImpl.java | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) 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 6bc869b..e064f0a 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 @@ -157,6 +157,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzjOld == null) { throw new ServiceException("给药制剂不存在或已删除"); } + if(!gyzjOld.getGdsqrId().equals(qmr.getUserId())){ + throw new ServiceException("只有归档申请人才能操作"); + } if (!gyzjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】未归档，不能解档"); } @@ -187,6 +190,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzjOld == null) { throw new ServiceException("给药制剂不存在或已删除"); } + if(!gyzjOld.getGdsqrId().equals(qmr.getUserId())){ + throw new ServiceException("只有归档申请人才能操作"); + } if (!gyzjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是归档状态，不能借阅"); } @@ -877,8 +883,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setNd(gyzjOld.getNdbj()); gyzjOld.setMc(gyzjOld.getMcbj()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData,qmr,null); + //通知 + noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意编辑",gyzjOld.getBjrId(),getUrlQz("gyzjList")); } else { gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr,null); + //通知 + noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝编辑",gyzjOld.getBjrId(),getUrlQz("gyzjList")); } //清空编辑信息 gyzjOld.setMcbj(null); @@ -976,8 +986,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr,null); gyzjOld.setKcdw(gyzjOld.getKcdwbj()); gyzjOld.setKc(gyzjOld.getKcbj()); + //通知 + noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意修改库存",gyzjOld.getKcbjrId(),getUrlQz("gyzjList")); } else { gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr,null); + //通知 + noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝修改库存",gyzjOld.getKcbjrId(),getUrlQz("gyzjList")); } //台账 gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,qmr,"修改库存",gyzjOld.getKcbj(),gyzjOld.getKcdw(),gyzjOld.getKcbjbz()); @@ -1093,7 +1107,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, jsr1, SecurityUtils.getNickName()); - + //通知 + noticeService.save("给药制剂【"+gyzjOld.getMc()+"】确认归还",ghr1.getUserId(),getUrlQz("gyzjList")); + noticeService.save("给药制剂【"+gyzjOld.getMc()+"】确认归还",ghr2.getUserId(),getUrlQz("gyzjList")); // 更新 gyzjOld.setKc(form.getRkl()); gyzjOld.setGhzytj(null); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index a940101..5c70d39 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -155,6 +155,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjyOld == null) { throw new ServiceException("麻精药不存在或已删除"); } + if(!mjyOld.getGdsqrId().equals(qmr.getUserId())){ + throw new ServiceException("只有归档申请人才能操作"); + } if (!mjyOld.getZjzt().equals(ZjztEnum.gd.getValue())) { throw new ServiceException("麻精药【" + mjyOld.getMc() + "】未归档，不能解档"); } @@ -185,6 +188,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjyOld == null) { throw new ServiceException("麻精药不存在或已删除"); } + if(!mjyOld.getGdsqrId().equals(qmr.getUserId())){ + throw new ServiceException("只有归档申请人才能操作"); + } if (!mjyOld.getZjzt().equals(ZjztEnum.gd.getValue())) { throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是归档状态，不能借阅"); } @@ -898,8 +904,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setNd(mjyOld.getNdbj()); mjyOld.setMc(mjyOld.getMcbj()); mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, qmr,null); + //通知 + noticeService.save("麻精药【"+mjyOld.getMc()+"】同意编辑",mjyOld.getBjrId(),getUrlQz("mjyList")); } else { mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr,null); + //通知 + noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝编辑",mjyOld.getBjrId(),getUrlQz("mjyList")); } //清空编辑信息 mjyOld.setMcbj(null); @@ -995,8 +1005,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr,null); mjyOld.setKcdw(mjyOld.getKcdwbj()); mjyOld.setKc(mjyOld.getKcbj()); + //通知 + noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝修改库存",mjyOld.getKcbjrId(),getUrlQz("mjyList")); } else { mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr,null); + //通知 + noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝编辑",mjyOld.getKcbjrId(),getUrlQz("mjyList")); } //台账 mjyTzService.saveTz(mjyOld.getId(),null,null,null,null,null,null,null,null,qmr,"修改库存",mjyOld.getKcbj(),mjyOld.getKcdw(),mjyOld.getKcbjbz()); @@ -1059,6 +1073,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.getNickName()); mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, null,null); + //通知 + noticeService.save("麻精药【"+mjyOld.getMc()+"】归还",mjyOld.getKcbjrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【"+mjyOld.getMc()+"】归还",mjyOld.getKcbjrId(),getUrlQz("mjyList")); // 更新 mjyOld.setKc(leftKc.toString()); mjyOld.setZjzt(ZjztEnum.rk.getValue());