From 3bf4090666876838bc63a78553f112f3126e657e Mon Sep 17 00:00:00 2001 From: luyie Date: Tue, 2 Dec 2025 20:19:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AF=B9=E8=B1=A1=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=92=8C=E5=81=9C=E7=94=A8=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/hzinfo_inspect/obj/web/ObjectController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/web/ObjectController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/web/ObjectController.java index 5f58a26..e2585d9 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/web/ObjectController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/web/ObjectController.java @@ -165,7 +165,7 @@ public class ObjectController extends BladeController { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { List delIdList = Func.toLongList(ids); QueryWrapper qw = new QueryWrapper<>(); - qw.lambda().in(PlanObjectTemplateEntity::getObjectId, delIdList); + qw.lambda().in(PlanObjectTemplateEntity::getObjectId, delIdList).eq(PlanObjectTemplateEntity::getIsDeleted, 0); int count = planObjectTemplateService.count(qw); if (count > 0) { return R.fail("该巡检对象已关联模板，请先取消关联"); @@ -183,7 +183,7 @@ public class ObjectController extends BladeController { @ApiOperation(value = "启用/停用", notes = "传入id,以及目标状态0-启用，1-停用") public R disableOrEnable(@RequestParam Long id, @RequestParam Integer status) { QueryWrapper qw = new QueryWrapper<>(); - qw.lambda().eq(PlanObjectTemplateEntity::getObjectId, id); + qw.lambda().eq(PlanObjectTemplateEntity::getObjectId, id).eq(PlanObjectTemplateEntity::getIsDeleted, 0); if (status == 1) { int count = planObjectTemplateService.count(qw); if (count > 0) {