|
|
@@ -344,7 +344,7 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
|
|
|
);
|
|
|
|
|
|
List<User> users = new ArrayList<>();
|
|
|
- List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"4",projectRecordsAlter.getCreateBy());
|
|
|
+ List<User> bmzrs = UserUtils.getByRoleActivityEnname("fzjl",3,office.getId(),"4",projectRecordsAlter.getCreateBy());
|
|
|
if (StringUtils.isNotBlank(workActivityMenu.getId())) {
|
|
|
processType = workActivityMenu.getProcessType();
|
|
|
workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
|
|
|
@@ -388,7 +388,7 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
|
|
|
workClientAttachmentDao.delete(workClientAttachment);
|
|
|
}
|
|
|
}*/
|
|
|
- throw new Exception("流程审批人不能为空,角色部门负责人下无用户,请联系管理员！");
|
|
|
+ throw new Exception("流程审批人不能为空,角色副总经理下无用户,请联系管理员！");
|
|
|
}
|
|
|
processType = "projectAlter";
|
|
|
variables.put("applyUserId", projectRecordsAlter.getCreateBy().getId());
|
|
|
@@ -401,7 +401,7 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
|
|
|
userIds.add(u.getId());
|
|
|
workProjectNotify.setUser(u);
|
|
|
workProjectNotify.setId("");
|
|
|
- workProjectNotify.setNotifyRole("部门负责人审批");
|
|
|
+ workProjectNotify.setNotifyRole("副总经理审批");
|
|
|
workProjectNotifyService.save(workProjectNotify);
|
|
|
Map<String,Object> extras = new HashMap<>();
|
|
|
extras.put("type","7003");
|
|
|
@@ -593,7 +593,7 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
|
|
|
if("yes".equals(projectRecordsAlter.getAct().getFlag())){
|
|
|
workActivityProcess.setIsApproval("1");
|
|
|
vars.put("pass",true);
|
|
|
- notifyRole = "部门负责人审批";
|
|
|
+ notifyRole = "副总经理审批";
|
|
|
}else{
|
|
|
workActivityProcess.setIsApproval("2");
|
|
|
projectRecordsAlter.setProjectStatus(AlterStatusEnum.RECALL.getValue());
|
user5