优化提交

ims-service/ims-eval/src/main/java/com/ims/eval/entity/DeptAssessmentDeclaration.java

@@ -1,6 +1,8 @@
 package com.ims.eval.entity;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,6 +20,7 @@ public class DeptAssessmentDeclaration extends Model {
 	private static final long serialVersionUID = 1L;
 
 	//主键
+	@JsonSerialize(using = ToStringSerializer.class)
 	private String id;
 	//单号规则
 	private String orderNumber;

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationDeptBusinessContentServiceImpl.java

@@ -44,8 +44,8 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
 			if (StringUtils.isEmpty(evaluationDeptBusinessContent.getId())) {
 				List<OrganizationStructure> organizationStructureList = organizationStructureService.getTree("23031001", 1, "140");
-				OrganizationStructure organizationStructure = organizationStructureList.stream().filter(item -> item.getId().equals(evaluationDeptBusinessContent.getDeptId())).findFirst().orElse(null);
-				if (ObjectUtil.isNotNull(organizationStructure)){
+				OrganizationStructure organizationStructure = organizationStructureList.get(0).getChildren().stream().filter(item -> item.getId().equals(evaluationDeptBusinessContent.getDeptId())).findFirst().orElse(null);
+				if (null !=organizationStructure){
 					evaluationDeptBusinessContent.setDeptName(organizationStructure.getName());
 					evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
 					b = super.save(evaluationDeptBusinessContent);