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