From 4d7a208f388e42e7dd83dab0e38eadfa0847de1c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 十二月 2024 19:24:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
index 6635c05..36138e4 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
@@ -31,10 +31,9 @@
public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
Page<TCompany> page = companyService.lambdaQuery()
.orderByDesc(TCompany::getCreateTime)
- .like(unitListQueryDto.getCompanyName() != null && unitListQueryDto.getCompanyName().isEmpty(), TCompany::getName, unitListQueryDto.getCompanyName())
+ .like(unitListQueryDto.getCompanyName() != null && unitListQueryDto.getCompanyName()!="", TCompany::getName, unitListQueryDto.getCompanyName())
.page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
return R.ok(page);
-
}
//单位添加
@@ -48,7 +47,12 @@
}
@PostMapping(value = "/unit/delete")
- public R<TCompany> delete(@RequestParam("id") Integer id) {
+ public R delete(@RequestParam("id") Integer id) {
+ return R.ok(companyService.removeById(id));
+ }
+
+ @PostMapping(value = "/unit/detail")
+ public R detail(@RequestParam("id") Integer id) {
return R.ok(companyService.getById(id));
}
}
--
Gitblit v1.7.1