From 6f16158f0afe260a08fe6186dfc969b2ea3cd006 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 31 Jan 2024 15:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ClassifyServiceImpl.java     | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
index 36de93b9b..e3376126b 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
@@ -48,10 +48,12 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDeptClient;
+import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -86,6 +88,8 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 
 	private final IUserClient userClient;
 
+	private final ISysClient sysClient;
+
 
 	@Override
 	public IPage<ClassifyVO> pageList(IPage<Object> page, Map<String, Object> classify) {
@@ -243,9 +247,36 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 
 		//保存考核内容
 		IndicatorsEntity indicatorsEntity = Func.copy(instanceofDTO, IndicatorsEntity.class);
-		indicatorsEntity.setIndicatorsStatus(1);
-		indicatorsEntity.setAssessUserId(user.getUserId());
-		indicatorsEntity.setAssessDeptName(user.getNickName());
+        assert indicatorsEntity != null;
+        indicatorsEntity.setIndicatorsStatus(1);
+//		indicatorsEntity.setAssessUserId(user.getUserId());
+//		indicatorsEntity.setAssessDeptName(user.getNickName());
+		// 增加当前选择部门的负责人
+
+		R<List<User>> listR = userClient.userInfoByDept(user.getTenantId(), instanceofDTO.getAssessDept());
+		Long userId=null;
+		String userName=null;
+		if(listR.isSuccess()){
+			List<User> data = listR.getData();
+			// 获取仓库经理ID
+			R<String> roleIs = sysClient.getRoleIds(user.getTenantId(), "仓库经理");
+			if(roleIs.isSuccess()){
+				String roleId = roleIs.getData();
+				for (User datum : data) {
+					if(datum.getPostId().contains(roleId)){
+						userId=datum.getId();
+						userName=datum.getRealName();
+					}
+				}
+			}
+		}
+		if(ObjectUtil.isEmpty(userId)){
+			return R.fail(403,"选择节点不存在仓库负责人");
+		}
+		indicatorsEntity.setAssessUserId(userId);
+		indicatorsEntity.setAssessUserName(userName);
+
+
 		iIndicatorsService.save(indicatorsEntity);
 
 		if (Func.isNotEmpty(instanceofDTO.getResourceList())) {