From 489db7a74dc976c8703a6bc30b55604194bb8ff7 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 6 Mar 2024 14:07:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2-bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/supervise/vo/ClassifyExportVO.java | 16 ++++++++--------
 .../service/impl/ClassifyServiceImpl.java        | 13 ++++++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyExportVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyExportVO.java
index 43414a24b..5a0b927be 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyExportVO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyExportVO.java
@@ -19,34 +19,34 @@ public class ClassifyExportVO implements Serializable {
 	@ExcelIgnore
 	private Long createDept;
 
-	@ExcelProperty(value = "创建时间")
+	@ExcelProperty(value = "创建时间",index = 7)
 	private Date createTime;
 
 	@ExcelIgnore
 	private Long updateUser;
 
-	@ExcelProperty(value = "指标名称")
+	@ExcelProperty(value = "指标名称",index = 1)
 	private String name;
 
-	@ExcelProperty(value = "指标描述")
+	@ExcelProperty(value = "指标描述",index = 2)
 	private String description;
 
-	@ExcelProperty(value = "指标备注")
+	@ExcelProperty(value = "指标备注",index = 3)
 	private String remark;
 
 	@ExcelIgnore
 	private Long pId;
 
-	@ExcelProperty(value = "考核范围")
+	@ExcelProperty(value = "考核范围",index = 4)
 	private String examineDeptName;
 
-	@ExcelProperty(value = "指标分类")
+	@ExcelProperty(value = "指标分类",index = 0)
 	private String parentClassifyName;
 
-	@ExcelProperty(value = "考核归属部门")
+	@ExcelProperty(value = "考核归属部门",index = 5)
 	private String createDeptName;
 
-	@ExcelProperty(value = "考核分值")
+	@ExcelProperty(value = "考核分值" ,index = 6)
 	private String pointStr;
 
 }
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 e9f09946c..87f01f75f 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
@@ -128,12 +128,15 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 			String deptName = deptClient.findNameById(deptId);
 			record.setCreateDeptName(deptName);
 
+			record.setIsEdit(0);
 			String ancestors = deptClient.getAncestorsByDeptId(deptId);
-			boolean contains = ancestors.contains(loginDeptId);
-			if(contains){
-				record.setIsEdit(1);
-			}else{
-				record.setIsEdit(0);
+			if(!StringUtil.isBlank(ancestors)){
+				boolean contains = ancestors.contains(loginDeptId);
+				if(contains){
+					record.setIsEdit(1);
+				}else{
+					record.setIsEdit(0);
+				}
 			}
 
 			if (!"1".equals(isPid)) {