songwb 2 hónapja
szülő
commit
7b1ff55b9f

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

@@ -519,7 +519,7 @@ public class DeptAssessmentDeclarationController {
 		for (DeptAssessmentDeclaration deptAssessmentDeclaration : deptAssessmentDeclarationList) {
 			QueryWrapper<EvaluationDept> qwDept = new QueryWrapper<>();
 			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {
-				qwDept.lambda().eq(EvaluationDept::getDeptId, deptAssessmentDeclaration.getDeptId());
+				qwDept.lambda().eq(EvaluationDept::getDeptId, deptAssessmentDeclaration.getDeptId()).eq(EvaluationDept::getDelFlag,"1");
 			}
 			EvaluationDept evaluationDept = evaluationDeptService.getOne(qwDept);
 			List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList = deptAssessmentDeclarationContentService.detailsList(deptAssessmentDeclaration.getId());
@@ -610,7 +610,7 @@ public class DeptAssessmentDeclarationController {
 		for (DeptAssessmentDeclaration deptAssessmentDeclaration : deptAssessmentDeclarationList) {
 			QueryWrapper<EvaluationDept> qwDept = new QueryWrapper<>();
 			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {
-				qwDept.lambda().eq(EvaluationDept::getDeptId, deptAssessmentDeclaration.getDeptId());
+				qwDept.lambda().eq(EvaluationDept::getDeptId, deptAssessmentDeclaration.getDeptId()).eq(EvaluationDept::getDelFlag,"1");
 			}
 			EvaluationDept evaluationDept = evaluationDeptService.getOne(qwDept);
 			List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList = deptAssessmentDeclarationContentService.detailsList(deptAssessmentDeclaration.getId());