From 3a836047202622f14728c03600f53ce2b3e53d48 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 22 Dec 2023 09:28:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8):=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsStandardizationServiceImpl.java  | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
index c9b28536..a2b75802 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
@@ -18,6 +18,7 @@ import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -391,22 +392,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 						.orderByDesc(LawsStandardizationGroup::getCreateTime));
 		for (LawsStandardizationGroup lawsStandardizationGroup : lawsStandardizationGroupList) {
 			// 人员信息
-			if (StringUtils.isNotBlank(lawsStandardizationGroup.getPersonnelId())){
-				// 我司人员
-				SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
-						.eq(SysUser::getId, lawsStandardizationGroup.getPersonnelId()));
-				lawsStandardizationGroup.setPersonnel(sysUser.getRealname());
-				// 工号
-				lawsStandardizationGroup.setJobNum(sysUser.getUsername());
-				//部门
-				List<SysDepart> sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId());
-				String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","));
-				lawsStandardizationGroup.setDepartment(departNames);
-				// 电话
-				lawsStandardizationGroup.setPhone(sysUser.getPhone());
-				// 邮箱
-				lawsStandardizationGroup.setMailbox(sysUser.getEmail());
-			}
+			setUserInfo(lawsStandardizationGroup);
 
 			// 文件信息
 			List<OSSFile> ossFileList = ossFileService.list(
@@ -421,6 +407,36 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		return lawsStandardizationGroupList;
 	}
 
+	private void setUserInfo(LawsStandardizationGroup lawsStandardizationGroup) {
+		if (StringUtils.isNotBlank(lawsStandardizationGroup.getPersonnelId())){
+			// 我司人员
+			SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
+					.eq(SysUser::getId, lawsStandardizationGroup.getPersonnelId()), false);
+			lawsStandardizationGroup.setPersonnel(sysUser.getRealname());
+			// 工号
+			lawsStandardizationGroup.setJobNum(sysUser.getUsername());
+			//部门
+			if (StringUtils.isBlank(lawsStandardizationGroup.getDepartment())
+					&& StringUtils.isNotBlank(sysUser.getDepartIds())){
+				List<SysDepart> sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId());
+				if (CollectionUtils.isNotEmpty(sysDeparts)){
+					String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","));
+					lawsStandardizationGroup.setDepartment(departNames);
+				}
+			}
+			// 电话
+			if (StringUtils.isBlank(lawsStandardizationGroup.getPhone())
+					&& StringUtils.isNotBlank(sysUser.getPhone())){
+				lawsStandardizationGroup.setPhone(sysUser.getPhone());
+			}
+			// 邮箱
+			if (StringUtils.isBlank(lawsStandardizationGroup.getMailbox())
+					&& StringUtils.isNotBlank(sysUser.getEmail())){
+				lawsStandardizationGroup.setMailbox(sysUser.getEmail());
+			}
+		}
+	}
+
 	@Override
 	public List<LawsStandardizationPayment> queryPaymentByStandardizationId(String standardizationId) {
 		List<LawsStandardizationPayment> lawsStandardizationPaymentList = lawsStandardizationPaymentService.list(