From d9c79ff82dfa0b159d6f4b756e22484397ca462d Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 15 Jan 2024 14:13:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92):=2080713?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsInspectPlanServiceImpl.java | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
index 5c63d18e..8f75d6ee 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
@@ -71,6 +71,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 		this.sysUserService = sysUserService;
 		this.sysDepartService = sysDepartService;
 	}
+
 	private static final String ERROR_MESSAGE = "模板错误，按照系统模板导入!";
 	private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -136,7 +137,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 		if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && EsInspectPlanCommon.PROCESS_NODE_2.equals(processEsInspectPlan.getNodeId())){
 			queryWrapper.and(qw ->
 					qw.like("object_of_consultation", loginUser.getId())
-						.or().eq("create_by", loginUser.getUsername()));
+							.or().eq("create_by", loginUser.getUsername()));
 		}
 		queryWrapper.orderByAsc("create_time");
 		return queryWrapper;
@@ -236,11 +237,13 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 				List<String> secondVerify = secondVerify(list.get(i));
 				List<String> thirdVerify = thirdVerify(list.get(i));
 				List<String> fifthVerify = fifthVerify(list.get(i));
-				List<String> sixthVerify = sixthVerify(list.get(i), true);
+				List<String> sixthVerify = sixthVerify(list.get(i));
+				List<String> seventhVerify = seventhVerify(list.get(i));
 				firstVerify.addAll(secondVerify);
 				firstVerify.addAll(thirdVerify);
 				firstVerify.addAll(fifthVerify);
 				firstVerify.addAll(sixthVerify);
+				firstVerify.addAll(seventhVerify);
 
 				if (!firstVerify.isEmpty()){
 					errorMSG.append(head).append(String.join("", firstVerify)).append("<br/>");
@@ -297,6 +300,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 			lists.remove(0);
 			List<ProcessEsInspectPlan> list = BeanCopyUtils.copyBeanList(lists, ProcessEsInspectPlan.class);
 			StringBuilder errorMSG = new StringBuilder();
+			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			// 字段校验
 			for (int i = 0; i < list.size(); i++) {
 				list.get(i).setProjectId(projectId);
@@ -305,7 +309,8 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 				List<String> secondVerify = secondVerify(list.get(i));
 				List<String> thirdVerify = thirdVerify(list.get(i));
 				List<String> fifthVerify = fifthVerify(list.get(i));
-				List<String> sixthVerify = sixthVerify(list.get(i), false);
+				List<String> sixthVerify = sixthVerify(list.get(i));
+				list.get(i).setObjectOfConsultation(loginUser.getId());
 				firstVerify.addAll(secondVerify);
 				firstVerify.addAll(thirdVerify);
 				firstVerify.addAll(fifthVerify);
@@ -345,7 +350,29 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 		}
 	}
 
-	private List<String> sixthVerify(ProcessEsInspectPlan processEsInspectPlan, boolean flag) {
+	private List<String> seventhVerify(ProcessEsInspectPlan processEsInspectPlan) {
+		List<String> errorList = new ArrayList<>();
+			if (StringUtils.isNotBlank(processEsInspectPlan.getObjectOfConsultation())){
+				String[] objectOfConsultationArr = processEsInspectPlan.getObjectOfConsultation().split(",");
+				List<String> userList = new ArrayList<>();
+				for (String objectOfConsultation : objectOfConsultationArr) {
+					SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(objectOfConsultation);
+					if (Objects.isNull(sysUser)){
+						errorList.add("征求意见对象不存在!");
+					}else {
+						userList.add(sysUser.getId());
+					}
+				}
+				if (!userList.isEmpty()){
+					processEsInspectPlan.setObjectOfConsultation(String.join(",", userList));
+				}
+			}else {
+				errorList.add("征求意见对象不能为空!");
+			}
+		return errorList;
+	}
+
+	private List<String> sixthVerify(ProcessEsInspectPlan processEsInspectPlan) {
 		List<String> errorList = new ArrayList<>();
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		if (StringUtils.isNotBlank(processEsInspectPlan.getStandardizationDockingUser())){
@@ -358,20 +385,6 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 		}else {
 			errorList.add("标准化组对接人不能为空!");
 		}
-		if (flag){
-			if (StringUtils.isNotBlank(processEsInspectPlan.getObjectOfConsultation())){
-				SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(processEsInspectPlan.getObjectOfConsultation());
-				if (Objects.isNull(sysUser)){
-					errorList.add("征求意见对象不存在!");
-				}else {
-					processEsInspectPlan.setObjectOfConsultation(sysUser.getId());
-				}
-			}else {
-				errorList.add("征求意见对象不能为空!");
-			}
-		}else {
-			processEsInspectPlan.setObjectOfConsultation(loginUser.getId());
-		}
 		// 填充创建人
 		processEsInspectPlan.setCreateBy(loginUser.getId());
 		processEsInspectPlan.setCreateByDictText(loginUser.calcNameWorkNo());