From 35f248276584f4224593f96b2fdfdb70d237a873 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 2 Jul 2024 11:28:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=BB=E9=99=A4=E8=81=94=E7=BB=9C?=
 =?UTF-8?q?=E4=BA=BA=E7=AE=A1=E7=90=86=E5=94=AF=E4=B8=80=E6=80=A7=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java   |  2 +-
 .../impl/LawsContactManageServiceImpl.java    | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

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 2bbcc10c..7414d1d9 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
@@ -371,7 +371,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
                 contactWrapper.eq(LawsContactManage::getContactId, userId);
                 List<LawsContactManage> list = contactManageService.list(contactWrapper);
-                if (list != null && !list.isEmpty()) {
+                if (list != null && list.size() == 1) {
                     data.setContactUserLeader(list.get(0).getLeaderId());
                 }
             case CONTACT_USER_LEADER_APPROVAL:
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java
index d552472c..3591b9df 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/system/service/impl/LawsContactManageServiceImpl.java
@@ -117,22 +117,22 @@ public class LawsContactManageServiceImpl extends ServiceImpl<LawsContactManageM
      */
     @Override
     public void add(LawsContactManage lawsContactManage) {
-        // 验证 部门名称+标准化工程师+联络人+部门联络人主管级领导唯一
-        LambdaQueryWrapper<LawsContactManage> queryLawsContactManage = new LambdaQueryWrapper<>();
-        queryLawsContactManage.eq(LawsContactManage::getDepartId, lawsContactManage.getDepartId());
-        queryLawsContactManage.eq(LawsContactManage::getContactId, lawsContactManage.getContactId());
-        queryLawsContactManage.eq(LawsContactManage::getLeaderId, lawsContactManage.getLeaderId());
-        long l = count(queryLawsContactManage);
-        if (l > 0) {
-            throw new JeroBootException("部门和联络人匹配关系已存在，请重新选择");
-        }
-
-        queryLawsContactManage.clear();
-        queryLawsContactManage.eq(LawsContactManage::getContactId, lawsContactManage.getContactId());
-        long n = count(queryLawsContactManage);
-        if (n > 0) {
-            throw new JeroBootException("已存在相同的联络人");
-        }
+//        // 验证 部门名称+标准化工程师+联络人+部门联络人主管级领导唯一
+//        LambdaQueryWrapper<LawsContactManage> queryLawsContactManage = new LambdaQueryWrapper<>();
+//        queryLawsContactManage.eq(LawsContactManage::getDepartId, lawsContactManage.getDepartId());
+//        queryLawsContactManage.eq(LawsContactManage::getContactId, lawsContactManage.getContactId());
+//        queryLawsContactManage.eq(LawsContactManage::getLeaderId, lawsContactManage.getLeaderId());
+//        long l = count(queryLawsContactManage);
+//        if (l > 0) {
+//            throw new JeroBootException("部门和联络人匹配关系已存在，请重新选择");
+//        }
+//
+//        queryLawsContactManage.clear();
+//        queryLawsContactManage.eq(LawsContactManage::getContactId, lawsContactManage.getContactId());
+//        long n = count(queryLawsContactManage);
+//        if (n > 0) {
+//            throw new JeroBootException("已存在相同的联络人");
+//        }
 
         Date now = new Date();
         lawsContactManage.setCreateTime(now);