diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 766e630..e13048a 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -755,7 +755,7 @@ public class ProjectController extends BaseController { /** - * 批量更新审批人 将该自己审批的任务转交给别人 + * 批量设置审批承接人 就是批量更新审批人 将该自己审批的任务转交给别人 */ @ResponseBody @RequestMapping("/batchUpdateApprove") diff --git a/src/main/java/cn/palmte/work/model/ProjectVisibleRepository.java b/src/main/java/cn/palmte/work/model/ProjectVisibleRepository.java index 25c4d15..edeb8d9 100644 --- a/src/main/java/cn/palmte/work/model/ProjectVisibleRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectVisibleRepository.java @@ -13,4 +13,7 @@ public interface ProjectVisibleRepository extends JpaRepository findProjectIdByTypeAndTid(int type,int tid); + + List findByProjectIdAndTypeAndTid(int projectId, int type, int tid); + } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 95c8903..05bfe5e 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -560,10 +560,26 @@ public class ProjectService { int adminId = obj.getIntValue("adminId"); Admin targetAdmin = adminRepository.findOne(adminId); - projectRepository.batchUpdateApprove(targetAdmin.getId(), targetAdmin.getRealName(), myAdminId); + //更新项目审批人 + Integer targetAdminId = targetAdmin.getId(); + projectRepository.batchUpdateApprove(targetAdminId, targetAdmin.getRealName(), myAdminId); for (Project project : projectList) { - actTaskDefService.setTaskAssignAndSaveRecord(project.getId(), targetAdmin); + int projectId = project.getId(); + if (projectVisibleRepository.findByProjectIdAndTypeAndTid(projectId, + ProjectVisible.TYPE_USER, targetAdminId).isEmpty()) { + //如果被指定人不可见项目 那么增加一条可进行配置 + ProjectVisible visible = new ProjectVisible(); + visible.setType(ProjectVisible.TYPE_USER); + visible.setProjectId(projectId); + visible.setTid(targetAdminId); + projectVisibleRepository.save(visible); + logger.info("saveVisible pId:{}, tId:{}", project, targetAdminId); + } + + //设置流程审批人 保存操作记录 + actTaskDefService.setTaskAssignAndSaveRecord(projectId, targetAdmin); + logger.info("setTaskAssignAndSaveRecord pId:{}, tId:{}", project, targetAdminId); } return ResponseMsg.buildSuccessMsg("指定承接人成功");