From 9371024befe9ccb0a2b3f0cd696a1882d741a929 Mon Sep 17 00:00:00 2001 From: Paidax Date: Sun, 25 Aug 2024 11:40:26 +0800 Subject: [PATCH] commit --- .../service/impl/HealthCheckupProjectServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java index 6e38026..a5884c2 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java @@ -3,6 +3,8 @@ package io.v.nutz.zhgh.healthCheckup.service.impl; import cn.hutool.core.date.DateUtil; import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.utils.ManyAddOrRenewUtil; +import io.v.nutz.sys.models.Sys_user; +import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.zhgh.data.constant.ConditionalOperational; import io.v.nutz.zhgh.data.constant.MatchMethod; @@ -14,8 +16,6 @@ import io.v.nutz.zhgh.healthCheckup.model.HealthCheckupUser; import io.v.nutz.zhgh.healthCheckup.model.HealthCheckupUserCompanion; import io.v.nutz.zhgh.healthCheckup.model.HealthCheckupUserSelection; import io.v.nutz.zhgh.healthCheckup.service.HealthCheckupProjectService; -import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.web.commons.utils.ShiroUtil; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; @@ -159,9 +159,9 @@ public class HealthCheckupProjectServiceImpl extends ViServiceImpl needInsertUsers = canInsertUsers.stream().filter(v -> !healthUserIdList.contains(v.getUserId())).collect(Collectors.toList()); - List userSelectionIds = selectionList.stream().map(HealthCheckupUserSelection::getId).collect(Collectors.toList()); - dao().clear(HealthCheckupUser.class, Cnd.where("userId", "in", needInsertUsers)); - dao().clear(HealthCheckupUserSelection.class, Cnd.where("selectUserId", "in", needInsertUsers)); + List userSelectionIds = selectionList.stream().filter(needDeleteUserIds::contains).map(HealthCheckupUserSelection::getId).collect(Collectors.toList()); + dao().clear(HealthCheckupUser.class, Cnd.where("userId", "in", needDeleteUserIds)); + dao().clear(HealthCheckupUserSelection.class, Cnd.where("selectUserId", "in", needDeleteUserIds)); dao().clear(HealthCheckupUserCompanion.class, Cnd.where("userSelectionId", "in", userSelectionIds)); manyAddOrRenewUtil.addOrRenew(needInsertUsers, true);