From 0685a2b648df7fc972f775c05092d39e845d6d4d Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 23 Feb 2024 16:55:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E9=83=A8=E9=97=A8=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AftersalesAppealServiceImpl.java  |  2 +-
 .../java/com/logpm/supervise/api/ClassifyApi.java  | 14 ++++++++++++++
 .../service/impl/ClassifyServiceImpl.java          |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java
index 37958af62..9dec497b6 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java
@@ -103,7 +103,7 @@ public class AftersalesAppealServiceImpl extends BaseServiceImpl<AftersalesAppea
 		BeanUtil.copyProperties(aftersalesAppeal,aftersalesAppealEntity);
 		if(ObjectUtils.isNotNull( aftersalesAppeal.getId())){
 			//修改
-			if(ObjectUtils.isNotNull( aftersalesAppeal.getPeopleEntityList()) ){
+			if(ObjectUtils.isNotNull( aftersalesAppeal.getPeopleEntityList())){
 				//修改实际责任人
 				List<AftersalesAppealPeopleEntity> list = aftersalesAppealPeopleService.list(Wrappers.<AftersalesAppealPeopleEntity>query().lambda()
 					.eq(AftersalesAppealPeopleEntity::getWorkOrderId, aftersalesAppeal.getWorkOrderId())
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
index c42b91c0b..997336da2 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
@@ -15,6 +15,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -42,6 +43,19 @@ public class ClassifyApi {
 			log.error(method+"部门id不能为空");
 			return null;
 		}
+		String dept = AuthUtil.getUser().getDeptId();
+		if (!("0").equals(dept)){
+			if (!deptId.contains(dept)){
+				log.error(method+"当前登录人无法对选择部门进行考核");
+				return R.fail("此账号无法对该部门进行考核");
+			}
+		}
+		List<Long> list = Func.toLongList(deptId);
+		int indexOf = list.indexOf(Long.parseLong(dept));
+		if (list.size() - 1 == indexOf){
+			//当前登录账号处于组织结构树最后一级就只能进行最后一级的指标项搜索
+			deptId = dept;
+		}
 		List<ClassifyApiVO> detail = classifyService.selectClassifyList(deptId);
 		return R.data(detail);
 	}
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 3a6a2d8f5..8265b63b7 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
@@ -244,7 +244,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	public List<ClassifyApiVO> selectClassifyList(String deptId) {
 		Long pid = 0L;
 		List<Long> listId = new ArrayList<>();
-			List<ClassifyApiVO> classifyEntities = getClassifyList(pid,null);
+		List<ClassifyApiVO> classifyEntities = getClassifyList(pid,null);
 		for (ClassifyApiVO classifyEntity : classifyEntities) {
 			if (classifyEntity.getPId().equals(0L)) {
 				List<ClassifyApiVO> classifyList = new ArrayList<>();