From 60c42d43e6342a2ea5fda5d60c3c9ebad3bbc4f0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 29 Jan 2024 10:31:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080448=20=E4=BC=81=E6=A0=87=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B=EF=BC=88=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E4=BA=BA=E4=B8=8A=E4=BC=A0=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=EF=BC=89--=E5=85=B6=E4=BB=96=E8=B5=B7=E8=8D=89=E4=BA=BA?=
 =?UTF-8?q?=E6=94=B6=E5=88=B0=E5=BE=85=E5=8A=9E=E4=B8=8E=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E6=9D=A1=E6=95=B0=E4=B8=80=E4=B8=80?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/OtherDraftUserVO.java           |  3 +++
 .../service/impl/EsRevisionServiceImpl.java   | 23 +++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java
index 2748c20c..12466f19 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java
@@ -40,6 +40,9 @@ public class OtherDraftUserVO {
     @ApiModelProperty(value = "1：不能操作显示/2：可以上传并且将起草人改为‘我’/3：可以上传起草人字段维持不变")
     private String operateType;
 
+    @ApiModelProperty(value = "绑定的taskId")
+    private String taskId;
+
     public String getISODeadlineTime() {
         SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
         return isoFormat.format(this.deadline);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index e5a2cd1d..e76db80f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -305,17 +305,30 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 } catch (Exception e) {
                     log.error("获取当前用户失败");
                 }
+                boolean findFlag = false;
+                otherDraftUserVOS.forEach(o -> {o.setOperateType(null);});
                 for (OtherDraftUserVO o : otherDraftUserVOS) {
-                    if (o.getUser().equals(curUserId)) {
-                        o.setOperateType(OperateTypeEnum.UPLOAD_AND_CHANGE_DRAFT_USER.getValue());
+                    if (findFlag) {
+                        o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
                         continue;
                     }
                     if (o.getUser().equals(userId)) {
-                        o.setOperateType(OperateTypeEnum.UPLOAD.getValue());
-                        continue;
+                        if (StrUtil.isBlank(o.getTaskId())) {
+                            o.setOperateType(OperateTypeEnum.UPLOAD.getValue());
+                            o.setTaskId(taskId);
+                            findFlag = true;
+                        } else {
+                            if (!taskId.equals(o.getTaskId())) {
+                                o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
+                            }
+                        }
+                    } else {
+                        o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
                     }
-                    o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
                 }
+                data.setOtherDraftUserVOS(otherDraftUserVOS);
+                data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
+                updateById(data);
                 break;
             case CONTACT_USER_DISTRIBUTE:
                 if (pass) {