From faf27b105f85b5b11e75f2fa041c2f53229794de Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 02 四月 2025 15:43:09 +0800
Subject: [PATCH] fix: 租赁计划修改page方法
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java | 1 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java | 1 -
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
index ff907e2..7e0859e 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
@@ -61,6 +61,7 @@
wrapper.eq(deviceDemandPlan.getDeclareCompId() !=null,DeviceDemandPlan::getDeclareCompId,deviceDemandPlan.getDeclareCompId());
wrapper.eq(deviceDemandPlan.getReleasePerson() !=null,DeviceDemandPlan::getReleasePerson,deviceDemandPlan.getReleasePerson());
wrapper.eq(deviceDemandPlan.getYear() !=null,DeviceDemandPlan::getYear,deviceDemandPlan.getYear());
+ wrapper.eq(DeviceDemandPlan::getType2,0);
wrapper.orderByDesc(DeviceDemandPlan::getCreateTime);
return R.ok(deviceDemandPlanService.pageByScope(page, wrapper));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
index 5379c42..bd5ecd0 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
@@ -126,7 +126,6 @@
@Operation(summary = "淇敼璁惧闇�姹傝鍒掗」鐩瓙琛�" , description = "淇敼璁惧闇�姹傝鍒掗」鐩瓙琛�" )
@SysLog("淇敼璁惧闇�姹傝鍒掗」鐩瓙琛�" )
@PutMapping
- @PreAuthorize("@pms.hasPermission('platformx_deviceDemandTotal_edit')" )
public R updateById(@RequestBody DeviceDemandTotal deviceDemandTotal) {
List<DeviceDemandSub> subList = deviceDemandTotal.getSubList();
QueryWrapper<DeviceDemandSub> wrapper = new QueryWrapper<>();
--
Gitblit v1.9.1