1.订单查询-bug修复

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;
 
 }

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)) {