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) {