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