From 1bdc7ff50ee1cf77f23599bc08e13f36409039d6 Mon Sep 17 00:00:00 2001
From: pengqiang <1067496116@qq.com>
Date: Wed, 31 Aug 2022 12:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=89=BF=E6=8E=A5=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=A1=B9=E7=9B=AE=E5=8F=AF=E8=A7=81=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProjectController.java |  2 +-
 .../work/model/ProjectVisibleRepository.java  |  3 +++
 .../palmte/work/service/ProjectService.java   | 20 +++++++++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

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<ProjectVisible,
     @Query(value = "SELECT project_id FROM project_visible WHERE type = ?1 and tid = ?2", nativeQuery = true)
     List<Integer> findProjectIdByTypeAndTid(int type,int tid);
 
+
+    List<ProjectVisible> 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("指定承接人成功");