爱心帮扶系统-体检管理-数据统计：修复‘导出教职工未选名单’忽略项目id的问题；

2026-05-29 11:33:34 +08:00
parent 8ec1fee263
commit b1dac74d37
1 changed files with 4 additions and 0 deletions
@@ -212,6 +212,8 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
                        """);
 //                cnd.and("aus.groupId","=",project.getActivityGroupId());
                sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )");
+                cnd.and("aus.projectId", "=", projectId);
+                cnd.and("u.id", "is not", null);
            }
        }
        if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) {
@@ -275,6 +277,8 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
                        """);
 //                cnd.and("aus.groupId","=",project.getActivityGroupId());
                sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )");
+                cnd.and("aus.projectId", "=", projectId);
+                cnd.and("u.id", "is not", null);
                cnd.asc("aus.sort");
            }
        }