绩效结果考核申报驳回修改信息问题

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DeptAssessmentDeclarationController.java

@@ -166,11 +166,11 @@ public class DeptAssessmentDeclarationController {
 					b = deptAssessmentDeclarationService.updateById(deptAssessmentDeclaration);
 				} else {
 					QueryWrapper<DeptAssessmentDeclaration> qw = new QueryWrapper<>();
-					if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {
-						qw.lambda().eq(DeptAssessmentDeclaration::getDeptId, deptAssessmentDeclaration.getDeptId());
+					if (StringUtils.isNotEmpty(od.getDeptId())) {
+						qw.lambda().eq(DeptAssessmentDeclaration::getDeptId, od.getDeptId());
 					}
-					if (null != deptAssessmentDeclaration.getAnnual()) {
-						qw.lambda().eq(DeptAssessmentDeclaration::getAnnual, deptAssessmentDeclaration.getAnnual());
+					if (null != od.getAnnual()) {
+						qw.lambda().eq(DeptAssessmentDeclaration::getAnnual, od.getAnnual());
 					}
 					if (null != deptAssessmentDeclaration.getDeclarationMonth()) {
 						qw.lambda().eq(DeptAssessmentDeclaration::getDeclarationMonth, deptAssessmentDeclaration.getDeclarationMonth());
@@ -186,7 +186,7 @@ public class DeptAssessmentDeclarationController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.error("修改失败！");
+				return R.error("修改失败或月份重复！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");