diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java index 317a46f..18b0564 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java @@ -94,11 +94,11 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS throw new SecurityException("归还人2不存在"); } //验证接收人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm(),true); //验证钥匙1归还人密码 - checkPassword(ghr1,form.getGhr1mm()); + checkPassword(ghr1,form.getGhr1mm(),true); //验证钥匙2归还人密码 - checkPassword(ghr2,form.getGhr2mm()); + checkPassword(ghr2,form.getGhr2mm(),true); if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); @@ -139,11 +139,11 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS throw new SecurityException("归还人2不存在"); } //验证接收人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm(),true); //验证钥匙1归还人密码 - checkPassword(ghr1,form.getGhr1mm()); + checkPassword(ghr1,form.getGhr1mm(),true); //验证钥匙2归还人密码 - checkPassword(ghr2,form.getGhr2mm()); + checkPassword(ghr2,form.getGhr2mm(),true); if (form.getIds().length<0) { throw new SecurityException("参数ids不正确"); } @@ -189,11 +189,11 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS throw new SecurityException("领取人2不存在"); } //验证发放人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getFfrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getFfrmm(),true); //验证钥匙1领取人密码 - checkPassword(lqr1,form.getLqr1mm()); + checkPassword(lqr1,form.getLqr1mm(),true); //验证钥匙2领取人密码 - checkPassword(lqr2,form.getLqr2mm()); + checkPassword(lqr2,form.getLqr2mm(),true); if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); } @@ -225,11 +225,11 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS * @param user * @param qmrmm */ - public void checkPassword(SysUser user,String qmrmm){ + public void checkPassword(SysUser user,String qmrmm,Boolean needName){ if(StringUtils.isBlank(qmrmm)){ throw new ServiceException("签名密码不能为空"); } - sysUserService.checkPassword(user,qmrmm,false); + sysUserService.checkPassword(user,qmrmm,needName); } } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml index 40c7fec..ff32b93 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml @@ -5,7 +5,7 @@