From ac9d58c63da69b03be067dcbcc95ccf69f57895b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 12 Dec 2023 10:13:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=89=BE=E5=88=B0=E7=9A=84=E8=81=94=E7=BB=9C=E4=BA=BA=E5=92=8C?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E5=B7=A5=E7=A8=8B=E5=B8=88=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=9C=89=E6=95=88=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsContactManageServiceImpl.java    | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

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 0c6b1280..cd3ad060 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
@@ -6,21 +6,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.laws.system.entity.LawsContactManage;
 import com.jero.modules.laws.system.mapper.LawsContactManageMapper;
 import com.jero.modules.laws.system.service.ILawsContactManageService;
+import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -30,6 +30,7 @@ import java.util.stream.Collectors;
  * @Date:   2023-10-13
  * @Version: V1.0
  */
+@Slf4j
 @Service
 @Transactional(rollbackFor = JeroBootException.class)
 public class LawsContactManageServiceImpl extends ServiceImpl<LawsContactManageMapper, LawsContactManage> implements ILawsContactManageService {
@@ -134,7 +135,15 @@ public class LawsContactManageServiceImpl extends ServiceImpl<LawsContactManageM
 		if (list == null || list.isEmpty()) {
 			return null;
 		} else {
-			return list.get(0).getContactId();
+			String contactUserId = list.get(0).getContactId();
+			SysUser user = sysUserService.getById(contactUserId);
+			// 判断用户是否有效
+			if (user == null) {
+				log.info("部门{}的联络人{}已经被删除", deptId, contactUserId);
+				return null;
+			} else {
+				return contactUserId;
+			}
 		}
 	}
 
@@ -146,7 +155,15 @@ public class LawsContactManageServiceImpl extends ServiceImpl<LawsContactManageM
 		if (list == null || list.isEmpty()) {
 			return null;
 		} else {
-			return list.get(0).getEngineerId();
+			String engineerId = list.get(0).getEngineerId();
+			SysUser user = sysUserService.getById(engineerId);
+			// 判断用户是否有效
+			if (user == null) {
+				log.info("部门{}的联络人{}已经被删除", deptId, engineerId);
+				return null;
+			} else {
+				return engineerId;
+			}
 		}
 	}