From ef29e36ccb159da5d3fd3c8ea7a5ded6efc19fc5 Mon Sep 17 00:00:00 2001 From: luyie Date: Mon, 1 Dec 2025 14:35:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A1=E6=A3=80=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9B=B4=E5=A4=9A=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzinfo_inspect/obj/services/impl/ObjectServiceImpl.java | 10 ---------- .../hzinfo_inspect/obj/web/ObjectController.java | 13 ------------- .../hzinfo_inspect/task/controller/TaskController.java | 7 ------- 3 files changed, 30 deletions(-) diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/services/impl/ObjectServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/services/impl/ObjectServiceImpl.java index 382e04e..a7f212e 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/services/impl/ObjectServiceImpl.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/services/impl/ObjectServiceImpl.java @@ -127,16 +127,6 @@ public class ObjectServiceImpl extends BaseServiceImpl> list(ObjectListQueryVO object, Query query, BladeUser bladeUser) { -// LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new ObjectEntity(),object); -// queryWrapper.orderByDesc(ObjectEntity::getUpdateTime); -// IPage pages = objectService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(ObjectEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper); -// return R.data(pages); -// } @GetMapping("/list") @ApiOperationSupport(order = 2) @@ -90,9 +81,6 @@ public class ObjectController extends BladeController { public R> list(ObjectListQueryVO object, Query query, BladeUser bladeUser) { IPage pages = Condition.getPage(query); ObjectEntity entity = new ObjectEntity(); -// if(!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)){ -// entity.setTenantId(bladeUser.getTenantId()); -// } entity.setCreateDept(Long.valueOf(bladeUser.getDeptId())); entity.setCode(object.getCode()); @@ -136,7 +124,6 @@ public class ObjectController extends BladeController { object.setCode(obj.getCode()); object.setType(obj.getType()); object.setRealId(obj.getRealId()); -// object.setTenantId(bladeUser.getTenantId()); object.setCreateDept(Long.valueOf(bladeUser.getDeptId())); pages.setRecords(otherObjectService.getUnbindListPage(pages,object)); return R.data(pages); diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/task/controller/TaskController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/task/controller/TaskController.java index 61538f9..b2d7093 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/task/controller/TaskController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/task/controller/TaskController.java @@ -105,14 +105,9 @@ public class TaskController extends BladeController { @GetMapping("/list") @ApiOperation(value = "分页显示任务列表", notes = "传入task") public R> list(TaskListQuery task, Query query) { -// CacheUtil.put("test#2","inspect","test","12"); -// LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new TaskEntity(),task); -// queryWrapper.orderByDesc(TaskEntity::getUpdateTime); -// IPage pages = taskService.page(Condition.getPage(query), queryWrapper); IPage pages = Condition.getPage(query); if(!AuthUtil.isAdministrator()){ task.setCurUserId(AuthUtil.getUserId()); - //task.setTenantId(AuthUtil.getTenantId()); } List list = taskService.getListPage(pages,task); pages.setRecords(list); @@ -127,7 +122,6 @@ public class TaskController extends BladeController { public R> listByDutyId(Long dutyId, Query query) { TaskListQuery task = new TaskListQuery(); task.setDutyId(dutyId); -// task.setTenantId(AuthUtil.getTenantId()); IPage pages = Condition.getPage(query); List list = taskService.getListPage(pages,task); pages.setRecords(list); @@ -142,7 +136,6 @@ public class TaskController extends BladeController { public R> robotList(TaskListQuery task, Query query) { IPage pages = Condition.getPage(query); task.setAutoVideo(PlanContants.InspectTypeEnum.ROBOT.getVal()); -// task.setTenantId(AuthUtil.getTenantId()); List list = taskService.getListPageAuth(pages,task); pages.setRecords(list); return R.data(pages);