|
@@ -1663,15 +1663,11 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
|
|
|
//判断 如果有开启签章 就判断签章 和 密码是否正确
|
|
|
if (userTaskConfig.getOpinionConfig().getEnabled() && userTaskConfig.getOpinionConfig().getSignature() == YesOrNoEnum.YES.getCode() && ObjectUtil.isNotNull(dto.getStampId())) {
|
|
|
- User user = userService.getOne(
|
|
|
- new QueryWrapper<User>().lambda()
|
|
|
- .eq(User::getId, StpUtil.getLoginIdAsLong())
|
|
|
- .eq(User::getSignFolderId, dto.getStampId())
|
|
|
- );
|
|
|
- if (user == null) {
|
|
|
+ Stamp stamp = stampService.getById(dto.getStampId());
|
|
|
+ if (ObjectUtil.isNull(stamp)) {
|
|
|
throw new MyException("找不到此签章!");
|
|
|
}
|
|
|
- if (!StrUtil.equals(user.getSignPassword(), dto.getStampPassword())) {
|
|
|
+ if (!StrUtil.equals(stamp.getPassword(), dto.getStampPassword())) {
|
|
|
throw new MyException("签章密码错误!");
|
|
|
}
|
|
|
}
|