fix：[资源库管理][麻精药，给药制剂]验证签名人密码

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java

@@ -104,8 +104,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jq(FfjlJqForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -120,7 +120,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "补充说明");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
@@ -132,8 +132,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jy(FfjlJyForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -158,7 +158,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请借阅");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
@@ -184,8 +184,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jd(FfjlJdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -203,7 +203,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请解档");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
@@ -216,8 +216,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plgd(FfjlGdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -244,7 +244,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
                 Map<String, String> formData = new LinkedHashMap<>();
                 formData.put("备注", form.getRemark());
                 formData.put("签名意义", "申请归档");
-                formData.put("签名人", qmr.getNickName());
+                formData.put("签名人", SecurityUtils.getNickName());
                 gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
                 gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId());
                 gyzjFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
@@ -265,8 +265,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void gd(FfjlGdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -284,7 +284,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请归档");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
@@ -298,8 +298,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plsd(FfjlSdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -324,7 +324,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", form.getRemark());
             formData.put("签名意义", "锁定发放记录");
-            formData.put("签名人", qmr.getNickName());
+            formData.put("签名人", SecurityUtils.getNickName());
 
             gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
             gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId());
@@ -346,8 +346,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void sd(FfjlSdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -364,7 +364,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "锁定发放记录");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
@@ -378,8 +378,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void js(FfjlJsForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -397,7 +397,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "解锁发放记录");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
@@ -498,4 +498,16 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
                 SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
     }
+
+    /**
+     * 验证密码
+     * @param user
+     * @param qmrmm
+     */
+    public void checkPassword(SysUser user,String qmrmm){
+        if(StringUtils.isBlank(qmrmm)){
+            throw new ServiceException("签名密码不能为空");
+        }
+        sysUserService.checkPassword(user,qmrmm,false);
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java

@@ -104,8 +104,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jq(FfjlJqForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -120,7 +120,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "补充说明");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
@@ -132,8 +132,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jy(FfjlJyForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -158,7 +158,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请借阅");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
@@ -184,8 +184,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jd(FfjlJdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -203,7 +203,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请解档");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
@@ -216,8 +216,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plgd(FfjlGdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -244,7 +244,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
                 Map<String, String> formData = new LinkedHashMap<>();
                 formData.put("备注", form.getRemark());
                 formData.put("签名意义", "申请归档");
-                formData.put("签名人", qmr.getNickName());
+                formData.put("签名人", SecurityUtils.getNickName());
                 mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
                 mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
                 mjyFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
@@ -265,8 +265,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void gd(FfjlGdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -284,7 +284,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请归档");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
@@ -298,8 +298,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plsd(FfjlSdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -324,7 +324,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", form.getRemark());
             formData.put("签名意义", "锁定发放记录");
-            formData.put("签名人", qmr.getNickName());
+            formData.put("签名人", SecurityUtils.getNickName());
 
             mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
             mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
@@ -346,8 +346,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void sd(FfjlSdForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -364,7 +364,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "锁定发放记录");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
@@ -378,8 +378,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void js(FfjlJsForm form) {
-        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
-        //验证签名人密码 todo
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -397,7 +397,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "解锁发放记录");
-        formData.put("签名人", qmr.getNickName());
+        formData.put("签名人", SecurityUtils.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
@@ -499,4 +499,17 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
                 SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
     }
+
+
+    /**
+     * 验证密码
+     * @param user
+     * @param qmrmm
+     */
+    public void checkPassword(SysUser user,String qmrmm){
+        if(StringUtils.isBlank(qmrmm)){
+            throw new ServiceException("签名密码不能为空");
+        }
+        sysUserService.checkPassword(user,qmrmm,false);
+    }
 }