Browse Source

业绩指标计划校验审核状态问题修改

hlf 1 year ago
parent
commit
5dd58783ef

+ 6 - 5
ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentalPerformanceIndicatorPlanController.java

@@ -17,7 +17,6 @@ import com.ims.eval.service.IEvaluationDeptService;
 import com.ims.eval.util.ExcelUtil;
 import com.ims.eval.util.WordUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.map.LinkedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -410,10 +409,12 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			}
 		} else {
 			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
-				if (!"0".equals(evaluationDeptBusinessContent.getAuditStatus())) {
-					b = false;
-					msg = "数据审核状态未通过,请联系相关部门进行审核!";
-					break;
+				if (evaluationDeptBusinessContent.getDeptId().equals(deptId)) {
+					if (!"0".equals(evaluationDeptBusinessContent.getAuditStatus())) {
+						b = false;
+						msg = "数据审核状态未通过,请联系相关部门进行审核!";
+						break;
+					}
 				}
 			}
 		}