diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 2ec4ddee..b0e41e73 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -389,7 +389,6 @@ public class XmTaskExecuserController { /** * 如果是候选人变更为执行人,需要检查该候选人是否已加入项目中的某个组 */ - String projectId=xmTaskExecuser.getProjectId(); String taskId=xmTaskExecuser.getTaskId(); XmTask xmTask= xmTaskService.selectOneObject(new XmTask(taskId)); if(xmTask==null ){ @@ -404,6 +403,8 @@ public class XmTaskExecuserController { return m; } User user=LoginUtils.getCurrentUserInfo(); + + String projectId=xmTask.getProjectId(); boolean isTaskCreater=user.getUserid().equals(xmTask.getCreateUserid()); List pgroups=groupService.getProjectGroupVoList(projectId); boolean isHead= groupService.checkUserIsOtherUserTeamHeadOrAss(pgroups, user.getUserid(), xmTaskExecuser.getUserid()); diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index 22448374..ada5461c 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -145,7 +145,7 @@ public class XmTaskExecuserService extends BaseService { * @param xmTaskExecuser */ public void becomeExecute(XmTask xmTaskDb,XmTaskExecuser xmTaskExecuser){ - String projectId=xmTaskExecuser.getProjectId(); + String projectId=xmTaskDb.getProjectId(); String taskId=xmTaskExecuser.getTaskId(); List pgroups=groupService.getProjectGroupVoList(projectId); User user=LoginUtils.getCurrentUserInfo(); @@ -186,14 +186,14 @@ public class XmTaskExecuserService extends BaseService { /** * 下面为推送任务执行人变更im通知消息 */ - String imMsg=xmTaskExecuser.getUsername()+"变更为任务["+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"]执行人"; + String imMsg=xmTaskExecuser.getUsername()+"变更为任务["+xmTaskDb.getId()+"-"+xmTaskDb.getName()+"]执行人"; for (XmGroupVo g : userGroups) { this.pushMsgService.pushGroupMsg(user.getBranchId(),g.getId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),imMsg ); this.pushMsgService.pushPrichatMsgToIm(user.getBranchId(), user.getUserid(),user.getUsername(),xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),imMsg); } this.pushMsgService.pushCssMsg(user.getBranchId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), imMsg); - notifyMsgService.pushMsg(user, xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), "2", xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "恭喜您被雇主选为任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskExecuser.getTaskName() + "】的中标人,请尽快开展工作。"); + notifyMsgService.pushMsg(user, xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), "2", xmTaskDb.getProjectId(), xmTaskExecuser.getTaskId(), "恭喜您被雇主选为任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskDb.getName() + "】的中标人,请尽快开展工作。"); updateXmTaskExeUseridsAndUsernamesByTaskId(taskId); xmRecordService.addXmTaskRecord(projectId, taskId, "项目-任务-变更为执行人", xmTaskExecuser.getUsername()+"变更为任务执行人",null,null);