修改问题

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

@@ -62,7 +62,8 @@ public class DeptAssessmentDeclarationContentServiceImpl extends ServiceImpl<Dep
 				if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getEmployeeId())) {
 					qw.lambda().like(DeptAssessmentDeclarationContent::getEmployeeId, deptAssessmentDeclarationContent.getEmployeeId());
 				}
-				if (ObjectUtil.isNull(super.getOne(qw))) {
+				List<DeptAssessmentDeclarationContent> objList1 = super.list(qw);
+				if (objList1.size() == 0) {
 					list1.add(deptAssessmentDeclarationContent);
 				} else {
 					b = false;
@@ -78,7 +79,8 @@ public class DeptAssessmentDeclarationContentServiceImpl extends ServiceImpl<Dep
 				if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getEmployeeId())) {
 					qw.lambda().like(DeptAssessmentDeclarationContent::getEmployeeId, deptAssessmentDeclarationContent.getEmployeeId());
 				}
-				if (ObjectUtil.isNotNull(super.getOne(qw))) {
+				List<DeptAssessmentDeclarationContent> objList2 = super.list(qw);
+				if (objList2.size() == 1) {
 					list2.add(deptAssessmentDeclarationContent);
 				} else {
 					QueryWrapper<DeptAssessmentDeclarationContent> qw1 = new QueryWrapper<>();
@@ -88,8 +90,8 @@ public class DeptAssessmentDeclarationContentServiceImpl extends ServiceImpl<Dep
 					if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getEmployeeId())) {
 						qw.lambda().like(DeptAssessmentDeclarationContent::getEmployeeId, deptAssessmentDeclarationContent.getEmployeeId());
 					}
-					DeptAssessmentDeclarationContent obj1 = super.getOne(qw1);
-					if (ObjectUtil.isNull(obj1)) {
+					List<DeptAssessmentDeclarationContent> objList3 = super.list(qw1);
+					if (objList3.size() == 0) {
 						list2.add(deptAssessmentDeclarationContent);
 					} else {
 						b = false;
@@ -119,7 +121,7 @@ public class DeptAssessmentDeclarationContentServiceImpl extends ServiceImpl<Dep
 				JSONArray array = JSONUtil.parseArray(jsonArr1.get("records"));
 				List<UserDTO> userList = JSONUtil.toList(array, UserDTO.class);
 				UserDTO user = userList.stream().filter(item -> item.getNo().equals(deptAssessmentDeclarationContent.getEmployeeNo())).findFirst().orElse(null);
-				if (ObjectUtil.isNotNull(user)) {
+				if (user != null) {
 					deptAssessmentDeclarationContent.setEmployeeId(user.getId());
 				}
 			}
@@ -130,9 +132,9 @@ public class DeptAssessmentDeclarationContentServiceImpl extends ServiceImpl<Dep
 			if (StringUtils.isNotEmpty(deptAssessmentDeclarationContent.getEmployeeNo())) {
 				qw.lambda().like(DeptAssessmentDeclarationContent::getEmployeeNo, deptAssessmentDeclarationContent.getEmployeeNo());
 			}
-			DeptAssessmentDeclarationContent obj = super.getOne(qw);
-			if (ObjectUtil.isNotNull(obj)) {//修改
-				deptAssessmentDeclarationContent.setId(obj.getId());
+			List<DeptAssessmentDeclarationContent> objList = super.list(qw);
+			if (objList.size() == 1) {//修改
+				deptAssessmentDeclarationContent.setId(objList.get(0).getId());
 				b = super.updateById(deptAssessmentDeclarationContent);
 			} else {
 				b = super.save(deptAssessmentDeclarationContent);

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

@@ -1,7 +1,6 @@
 package com.ims.eval.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.EvaluationDeptBusinessContentMapper;
@@ -45,7 +44,7 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 			if (StringUtils.isEmpty(evaluationDeptBusinessContent.getId())) {
 				List<OrganizationStructure> organizationStructureList = organizationStructureService.getTree("23031001", 1, "140");
 				OrganizationStructure organizationStructure = organizationStructureList.get(0).getChildren().stream().filter(item -> item.getId().equals(evaluationDeptBusinessContent.getDeptId())).findFirst().orElse(null);
-				if (null !=organizationStructure){
+				if (null != organizationStructure) {
 					evaluationDeptBusinessContent.setDeptName(organizationStructure.getName());
 					evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
 					b = super.save(evaluationDeptBusinessContent);