修改业绩指标考评问题

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

@@ -73,7 +73,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		@RequestParam(value = "des", required = false) String des,
 		@RequestParam(value = "appraisalYear", required = false) String appraisalYear,
 		@RequestParam(value = "stage", required = false) String stage) {
-		IPage<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.listPage(pageNum, pageSize, deptId, responsibilityCode, des, appraisalYear, stage,request);
+		IPage<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.listPage(pageNum, pageSize, deptId, responsibilityCode, des, appraisalYear, stage, request);
 		return R.ok().data(list);
 	}
 
@@ -277,10 +277,12 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 			}
 		} else {
 			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
-				if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
-					b = false;
-					msg = "数据审核状态未通过，请联系相关部门进行审核！";
-					break;
+				if (evaluationDeptBusinessContent.getDeptId().equals(deptId)) {
+					if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
+						b = false;
+						msg = "数据审核状态未通过，请联系相关部门进行审核！";
+						break;
+					}
 				}
 			}
 		}