Merge remote-tracking branch 'origin/master'

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

@@ -413,10 +413,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;
+					}
 				}
 			}
 		}

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

@@ -616,7 +616,7 @@ public class DeptAssessmentDeclarationController {
 	 */
 	@GetMapping(value = "/participantsNumber/{id}")
 	public R participantsNumber(@PathVariable String id) {
-		QueryWrapper<DeptAssessmentDeclarationComplete> qwComplete = new QueryWrapper<>();
+		/*QueryWrapper<DeptAssessmentDeclarationComplete> qwComplete = new QueryWrapper<>();
 		if (StringUtils.isNotEmpty(id)) {
 			qwComplete.lambda().eq(DeptAssessmentDeclarationComplete::getAssessmentDeclarationId, id);
 		}
@@ -630,7 +630,8 @@ public class DeptAssessmentDeclarationController {
 			return R.ok().data(countContent);
 		} else {
 			return R.error("未添加工作完成情况！");
-		}
+		}*/
+		return R.ok();
 	}
 
 	/**