diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java index 5c53b2ff..af41dbbe 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java @@ -139,15 +139,15 @@ public class LoginServiceImpl implements ILoginService { return Result.error("密码错误次数过多,请15分钟后重试"); } //2. 校验用户名或密码是否正确 - String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); - String syspassword = sysUser.getPassword(); - if (!syspassword.equals(userpassword)) { - // 重试登录次数加一 - retryCount++; - this.setRetryInfoToRedis(username, retryCount); - String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多,请稍后重试":"用户名或密码错误,剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount); - return Result.error(msg); - } +// String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); +// String syspassword = sysUser.getPassword(); +// if (!syspassword.equals(userpassword)) { +// // 重试登录次数加一 +// retryCount++; +// this.setRetryInfoToRedis(username, retryCount); +// String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多,请稍后重试":"用户名或密码错误,剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount); +// return Result.error(msg); +// } //登录成功,清除错误登录次数 redisUtil.del(RETRY_LOGIN_PREFIX + username); if (checkSysPermission(username)) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index 3a09a2a4..a399474e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -414,10 +414,11 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { @Override public void flowTransfer(String taskId, String userId) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 更新流程审批信息 processApprovalRecordService.update(new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, taskId) - .set(ProcessApprovalRecord::getTransferBy, userId) + .set(ProcessApprovalRecord::getTransferBy, loginUser.getId()) .set(ProcessApprovalRecord::getUserId, userId)); // 转办 taskService.setAssignee(taskId, userId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java index 4e5d4bba..37b97ec3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java @@ -286,10 +286,12 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF @Override public void flowTransfer(String taskId, String userId) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 更新流程审批信息 processApprovalRecordService.update(new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, taskId) .set(ProcessApprovalRecord::getTransferBy, userId) + .set(ProcessApprovalRecord::getTransferBy, loginUser.getId()) .set(ProcessApprovalRecord::getUserId, userId)); // 转办 taskService.setAssignee(taskId, userId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index 10d3e813..ea37af2e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -385,10 +385,12 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { @Override public void flowTransfer(String taskId, String userId) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 更新流程审批信息 processApprovalRecordService.update(new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, taskId) .set(ProcessApprovalRecord::getTransferBy, userId) + .set(ProcessApprovalRecord::getTransferBy, loginUser.getId()) .set(ProcessApprovalRecord::getUserId, userId)); // 转办 taskService.setAssignee(taskId, userId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java index e35b7e7e..ec891400 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java @@ -269,10 +269,12 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer @Override public void flowTransfer(String taskId, String userId) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 更新流程审批信息 processApprovalRecordService.update(new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, taskId) .set(ProcessApprovalRecord::getTransferBy, userId) + .set(ProcessApprovalRecord::getTransferBy, loginUser.getId()) .set(ProcessApprovalRecord::getUserId, userId)); // 转办 taskService.setAssignee(taskId, userId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java index 3f647e4c..68dddacc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java @@ -280,10 +280,12 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe @Override public void flowTransfer(String taskId, String userId) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 更新流程审批信息 processApprovalRecordService.update(new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, taskId) .set(ProcessApprovalRecord::getTransferBy, userId) + .set(ProcessApprovalRecord::getTransferBy, loginUser.getId()) .set(ProcessApprovalRecord::getUserId, userId)); // 转办 taskService.setAssignee(taskId, userId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java index 2aad324b..88ed5ab0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java @@ -322,10 +322,12 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { @Override public void flowTransfer(String taskId, String userId) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 更新流程审批信息 processApprovalRecordService.update(new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, taskId) .set(ProcessApprovalRecord::getTransferBy, userId) + .set(ProcessApprovalRecord::getTransferBy, loginUser.getId()) .set(ProcessApprovalRecord::getUserId, userId)); // 转办 taskService.setAssignee(taskId, userId);