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 24a83f3..01cdb51 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 @@ -133,7 +133,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void jq(FfjlJqForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -158,7 +158,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void jy(FfjlJyForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -211,7 +211,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void jd(FfjlJdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -241,7 +241,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void plgd(FfjlGdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(),false,null); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -281,7 +281,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void gd(FfjlGdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -315,7 +315,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void plsd(FfjlSdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(),false,null); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -348,7 +348,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void sd(FfjlSdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -377,7 +377,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void js(FfjlJsForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -587,7 +587,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void tygd(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -615,7 +615,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void jjgd(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -646,7 +646,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void tyjd(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -675,7 +675,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void jjjd(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -705,7 +705,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void tyjy(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -738,7 +738,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void jjjy(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -772,7 +772,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public void qrgh(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -824,11 +824,20 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i * @param user * @param qmrmm */ - public void checkPassword(SysUser user, String qmrmm,Boolean needName) { + public void checkPassword(SysUser user, String qmrmm, Boolean needName,String name) { if (StringUtils.isBlank(qmrmm)) { throw new ServiceException("签名密码不能为空"); } - sysUserService.checkPassword(user, qmrmm, false); + try{ + sysUserService.checkPassword(user, qmrmm, needName); + }catch (Exception ex){ + if(StringUtils.isNoneBlank(name)){ + throw new ServiceException(name+"密码错误"); + }else{ + throw new ServiceException(ex.getMessage()); + } + } + } /** 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 0036bf4..8c77b27 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 @@ -294,7 +294,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void jd(JdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -327,7 +327,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void jy(JyForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -368,7 +368,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void plgd(GdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -408,7 +408,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void gd(GdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -442,7 +442,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void plsd(SdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -475,7 +475,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void sd(SdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -503,7 +503,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void js(JsForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -531,7 +531,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void plczyj(PlczyjForm form) { SysUser clr = SecurityUtils.getLoginUser().getSysUser(); //验证处理人密码 - checkPassword(clr, form.getClrmm(), false); + checkPassword(clr, form.getClrmm(), false,null); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); @@ -592,7 +592,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser clr = SecurityUtils.getLoginUser().getSysUser(); //验证处理人密码 - checkPassword(clr, form.getClrmm(), false); + checkPassword(clr, form.getClrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -647,11 +647,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(), true); + checkPassword(clr, form.getClrmm(), true,"处理人"); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(), true); + checkPassword(fhr, form.getFhrmm(), true,"复核人"); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(), true); + checkPassword(jdr, form.getJdrmm(), true,"监督人"); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -703,11 +703,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(), true); + checkPassword(clr, form.getClrmm(), true,"处理人"); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(), true); + checkPassword(fhr, form.getFhrmm(), true,"复核人"); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(), true); + checkPassword(jdr, form.getJdrmm(), true,"监督人"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -748,11 +748,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); //验证领取人1密码 - checkPassword(lqr1, form.getLqr1mm(), true); + checkPassword(lqr1, form.getLqr1mm(), true,"领取人1"); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(), true); + checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); //验证发放人密码 - checkPassword(ffr1, form.getFfrmm(), true); + checkPassword(ffr1, form.getFfrmm(), true,"发放人"); Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { throw new ServiceException("暂存柜不存在或已删除"); @@ -819,13 +819,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1, form.getLqr1mm(), true); + checkPassword(lqr1, form.getLqr1mm(), true,"领取人1"); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(), true); + checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); //验证发放人1密码 - checkPassword(ffr1, form.getFfr1mm(), true); + checkPassword(ffr1, form.getFfr1mm(), true,"发放人1"); //验证发放人2密码 - checkPassword(ffr2, form.getFfr2mm(), true); + checkPassword(ffr2, form.getFfr2mm(), true,"发放人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -883,13 +883,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1, form.getLqr1mm(), true); + checkPassword(lqr1, form.getLqr1mm(), true,"领取人1"); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(), true); + checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); //验证发放人1密码 - checkPassword(ffr1, form.getFfr1mm(), true); + checkPassword(ffr1, form.getFfr1mm(), true,"发放人1"); //验证发放人2密码 - checkPassword(ffr2, form.getFfr2mm(), true); + checkPassword(ffr2, form.getFfr2mm(), true,"发放人2"); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -954,7 +954,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void bj(BjForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1002,7 +1002,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void shbj(ShbjForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1062,7 +1062,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void xgkc(XgkcForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1110,7 +1110,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void shxgkc(ShxgkcForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1161,9 +1161,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser ghr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); //验证归还人1密码 - checkPassword(ghr1, form.getGhr1mm(), true); + checkPassword(ghr1, form.getGhr1mm(), true,"归还人1"); //验证归还人2密码 - checkPassword(ghr2, form.getGhr2mm(), true); + checkPassword(ghr2, form.getGhr2mm(), true,"归还人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1217,9 +1217,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); //验证接收人1密码 - checkPassword(jsr1, form.getJsr1mm(), true); + checkPassword(jsr1, form.getJsr1mm(), true,"接收人1"); //验证接收人2密码 - checkPassword(jsr2, form.getJsr2mm(), true); + checkPassword(jsr2, form.getJsr2mm(), true,"接收人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1278,9 +1278,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser qmr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); //验证签名人1密码 - checkPassword(qmr1, form.getQmr1mm(), true); + checkPassword(qmr1, form.getQmr1mm(), true,"签名人1"); //验证签名人2密码 - checkPassword(qmr2, form.getQmr2mm(), true); + checkPassword(qmr2, form.getQmr2mm(), true,"签名人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1328,9 +1328,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); //验证接收人1密码 - checkPassword(jsr1, form.getJsr1mm(), true); + checkPassword(jsr1, form.getJsr1mm(), true,"接收人1"); //验证接收人2密码 - checkPassword(jsr2, form.getJsr2mm(), true); + checkPassword(jsr2, form.getJsr2mm(), true,"接收人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1384,9 +1384,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void cc(CcForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); - //验证签名人密码 - checkPassword(qmr, form.getQmr1mm(), true); - checkPassword(qmr2, form.getQmr2mm(), true); + //验证签名人1密码 + checkPassword(qmr, form.getQmr1mm(), true,"签名人1"); + //验证签名人2密码 + checkPassword(qmr2, form.getQmr2mm(), true,"签名人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1423,9 +1424,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void qc(CcForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); - //验证签名人密码 - checkPassword(qmr, form.getQmr1mm(), true); - checkPassword(qmr2, form.getQmr2mm(), true); + //验证签名人1密码 + checkPassword(qmr, form.getQmr1mm(), true,"签名人1"); + //验证签名人2密码 + checkPassword(qmr2, form.getQmr2mm(), true,"签名人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1716,7 +1718,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void tygd(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1744,7 +1746,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void jjgd(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1775,7 +1777,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void tyjd(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1804,7 +1806,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void jjjd(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1835,7 +1837,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void tyjy(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1868,7 +1870,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void jjjy(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1902,7 +1904,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG public void qrgh(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1953,11 +1955,20 @@ public class GyzjServiceImpl extends ServiceImpl implements IG * @param user * @param qmrmm */ - public void checkPassword(SysUser user, String qmrmm, Boolean needName) { + public void checkPassword(SysUser user, String qmrmm, Boolean needName,String name) { if (StringUtils.isBlank(qmrmm)) { throw new ServiceException("签名密码不能为空"); } - sysUserService.checkPassword(user, qmrmm, needName); + try{ + sysUserService.checkPassword(user, qmrmm, needName); + }catch (Exception ex){ + if(StringUtils.isNoneBlank(name)){ + throw new ServiceException(name+"密码错误"); + }else{ + throw new ServiceException(ex.getMessage()); + } + } + } /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java index f435ac5..887d2ca 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java @@ -133,7 +133,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void jq(FfjlJqForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -158,7 +158,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void jy(FfjlJyForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -210,7 +210,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void jd(FfjlJdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -240,7 +240,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void plgd(FfjlGdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -280,7 +280,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void gd(FfjlGdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -312,7 +312,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void plsd(FfjlSdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -345,7 +345,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void sd(FfjlSdForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -374,7 +374,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void js(FfjlJsForm form) { SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -590,7 +590,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void tygd(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -618,7 +618,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void jjgd(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -649,7 +649,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void tyjd(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -678,7 +678,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void jjjd(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -708,7 +708,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void tyjy(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -741,7 +741,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void jjjy(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -775,7 +775,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public void qrgh(ArchiveForm form){ SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr,form.getQmrmm(),false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -826,11 +826,20 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl * @param user * @param qmrmm */ - public void checkPassword(SysUser user,String qmrmm,Boolean needName){ - if(StringUtils.isBlank(qmrmm)){ + public void checkPassword(SysUser user, String qmrmm, Boolean needName,String name) { + if (StringUtils.isBlank(qmrmm)) { throw new ServiceException("签名密码不能为空"); } - sysUserService.checkPassword(user,qmrmm,needName); + try{ + sysUserService.checkPassword(user, qmrmm, needName); + }catch (Exception ex){ + if(StringUtils.isNoneBlank(name)){ + throw new ServiceException(name+"密码错误"); + }else{ + throw new ServiceException(ex.getMessage()); + } + } + } /** 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 2d3b393..742cb9c 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 @@ -160,7 +160,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void jd(JdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -193,7 +193,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void jy(JyForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -234,7 +234,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void plgd(GdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -274,7 +274,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void gd(GdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -308,7 +308,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void plsd(SdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -341,7 +341,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void sd(SdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -369,7 +369,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void js(JsForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -399,11 +399,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(), true); + checkPassword(clr, form.getClrmm(), true,"处理人"); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(), true); + checkPassword(fhr, form.getFhrmm(), true,"复核人"); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(), true); + checkPassword(jdr, form.getJdrmm(), true,"监督人"); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); @@ -465,11 +465,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(), true); + checkPassword(clr, form.getClrmm(), true,"处理人"); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(), true); + checkPassword(fhr, form.getFhrmm(), true,"复核人"); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(), true); + checkPassword(jdr, form.getJdrmm(), true,"监督人"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -514,11 +514,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(), true); + checkPassword(clr, form.getClrmm(), true,"处理人"); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(), true); + checkPassword(fhr, form.getFhrmm(), true,"复核人"); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(), true); + checkPassword(jdr, form.getJdrmm(), true,"监督人"); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); @@ -571,11 +571,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(), true); + checkPassword(clr, form.getClrmm(), true,"处理人"); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(), true); + checkPassword(fhr, form.getFhrmm(), true,"复核人"); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(), true); + checkPassword(jdr, form.getJdrmm(), true,"监督人"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -618,11 +618,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); //验证领取人1密码 - checkPassword(lqr1, form.getLqr1mm(), true); + checkPassword(lqr1, form.getLqr1mm(), true,"领取人1"); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(), true); + checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); //验证发放人密码 - checkPassword(ffr1, form.getFfrmm(), true); + checkPassword(ffr1, form.getFfrmm(), true,"发放人"); Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { @@ -690,13 +690,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1, form.getLqr1mm(), true); + checkPassword(lqr1, form.getLqr1mm(), true,"领取人1"); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(), true); + checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); //验证发放人1密码 - checkPassword(ffr1, form.getFfr1mm(), true); + checkPassword(ffr1, form.getFfr1mm(), true,"发放人1"); //验证发放人2密码 - checkPassword(ffr2, form.getFfr2mm(), true); + checkPassword(ffr2, form.getFfr2mm(), true,"发放人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -763,13 +763,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1, form.getLqr1mm(), true); + checkPassword(lqr1, form.getLqr1mm(), true,"领取人1"); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(), true); + checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); //验证发放人1密码 - checkPassword(ffr1, form.getFfr1mm(), true); + checkPassword(ffr1, form.getFfr1mm(), true,"发放人1"); //验证发放人2密码 - checkPassword(ffr2, form.getFfr2mm(), true); + checkPassword(ffr2, form.getFfr2mm(), true,"发放人2"); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); @@ -844,7 +844,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void bj(BjForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -891,7 +891,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void shbj(ShbjForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -950,7 +950,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void xgkc(XgkcForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -997,7 +997,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void shxgkc(ShxgkcForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1049,13 +1049,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); //验证归还人1密码 - checkPassword(ghr1, form.getGhr1mm(), true); + checkPassword(ghr1, form.getGhr1mm(), true,"归还人1"); //验证归还人2密码 - checkPassword(ghr2, form.getGhr2mm(), true); + checkPassword(ghr2, form.getGhr2mm(), true,"归还人2"); //验证接收人1密码 - checkPassword(jsr1, form.getJsr1mm(), true); + checkPassword(jsr1, form.getJsr1mm(), true,"接收人1"); //验证接收人2密码 - checkPassword(jsr2, form.getJsr2mm(), true); + checkPassword(jsr2, form.getJsr2mm(), true,"接收人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1110,13 +1110,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); //验证签名人1密码 - checkPassword(qmr1, form.getQmr1mm(), true); + checkPassword(qmr1, form.getQmr1mm(), true,"签名人1"); //验证签名人2密码 - checkPassword(qmr2, form.getQmr2mm(), true); + checkPassword(qmr2, form.getQmr2mm(), true,"签名人2"); //验证接收人1密码 - checkPassword(jsr1, form.getJsr1mm(), true); + checkPassword(jsr1, form.getJsr1mm(), true,"接收人1"); //验证接收人2密码 - checkPassword(jsr2, form.getJsr2mm(), true); + checkPassword(jsr2, form.getJsr2mm(), true,"接收人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1159,9 +1159,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void cc(com.hxhq.business.form.mjy.CcForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); - //验证签名人密码 - checkPassword(qmr, form.getQmr1mm(), true); - checkPassword(qmr2, form.getQmr2mm(), true); + //验证签名人1密码 + checkPassword(qmr, form.getQmr1mm(), true,"签名人1"); + //验证签名人2密码 + checkPassword(qmr2, form.getQmr2mm(), true,"签名人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1196,9 +1197,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void qc(com.hxhq.business.form.mjy.CcForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); - //验证签名人密码 - checkPassword(qmr, form.getQmr1mm(), true); - checkPassword(qmr2, form.getQmr2mm(), true); + //验证签名人1密码 + checkPassword(qmr, form.getQmr1mm(), true,"签名人1"); + //验证签名人2密码 + checkPassword(qmr2, form.getQmr2mm(), true,"签名人2"); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1489,7 +1491,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void tygd(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1517,7 +1519,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void jjgd(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1548,7 +1550,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void tyjd(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1577,7 +1579,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void jjjd(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1607,7 +1609,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void tyjy(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1640,7 +1642,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void jjjy(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1674,7 +1676,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void qrgh(ArchiveForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(), false); + checkPassword(qmr, form.getQmrmm(), false,null); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1725,11 +1727,20 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * @param user * @param qmrmm */ - public void checkPassword(SysUser user, String qmrmm, Boolean needName) { + public void checkPassword(SysUser user, String qmrmm, Boolean needName,String name) { if (StringUtils.isBlank(qmrmm)) { throw new ServiceException("签名密码不能为空"); } - sysUserService.checkPassword(user, qmrmm, needName); + try{ + sysUserService.checkPassword(user, qmrmm, needName); + }catch (Exception ex){ + if(StringUtils.isNoneBlank(name)){ + throw new ServiceException(name+"密码错误"); + }else{ + throw new ServiceException(ex.getMessage()); + } + } + }