diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java index b507d624..36252ee8 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java @@ -323,6 +323,7 @@ public class HealthCheckupSingleController { $projectCnd $condition """); cnd.and("hcu.projectId", "=", projectId); + sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )"); cnd.groupBy("u.loginname"); @@ -330,11 +331,13 @@ public class HealthCheckupSingleController { List mapList = healthCheckupSingleService.listMap(sql); if(CollectionUtil.isEmpty(mapList)) return Result.success(); - List userIds = mapList.stream().map(v -> v.getString("id")).toList(); + List userIds = mapList.stream().map(v -> v.getString("id")).filter(Strings::isNotBlank).toList(); //去年项目的人 - List lastYearSelectionList = dao.query(HealthCheckupUserSelection.class, Cnd.where(HealthCheckupUserSelection::getProjectId, "=", lastYearProject.getId()) - .and(HealthCheckupUserSelection::getSelectUserId, "in", userIds)); + Cnd aNew = Cnd.NEW(); + aNew.and(HealthCheckupUserSelection::getProjectId, "=", lastYearProject.getId()) + .and(HealthCheckupUserSelection::getSelectUserId, "in", userIds); + List lastYearSelectionList = dao.query(HealthCheckupUserSelection.class, aNew); //去年项目下的医院 List lastYearSubjectList = dao.query(HealthCheckupProjectSubject.class,